summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/libglade/Makefile3
-rw-r--r--devel/libglade/files/patch-sum4
-rw-r--r--devel/libglade/patches/patch-ab16
-rw-r--r--devel/libhfs/files/patch-sum6
-rw-r--r--devel/libhfs/patches/patch-ac8
-rw-r--r--devel/libhfs/patches/patch-ad8
-rw-r--r--x11/gnome-libs/files/patch-sum6
-rw-r--r--x11/gnome-libs/patches/patch-aa22
-rw-r--r--x11/gnome-libs/patches/patch-ah14
9 files changed, 44 insertions, 43 deletions
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 1d34bd1e129..722caba06c6 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/10/29 07:53:03 tron Exp $
+# $NetBSD: Makefile,v 1.17 1999/11/15 18:50:32 rh Exp $
#
DISTNAME= libglade-0.7
@@ -18,6 +18,7 @@ USE_X11BASE= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
+LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
pre-configure:
${RM} ${WRKSRC}/libgladeConf.sh
diff --git a/devel/libglade/files/patch-sum b/devel/libglade/files/patch-sum
index 30f7eeefb43..84ba321cb95 100644
--- a/devel/libglade/files/patch-sum
+++ b/devel/libglade/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/08/01 19:43:34 tron Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/15 18:50:32 rh Exp $
MD5 (patch-aa) = 6983c71d16a2a72fd2da0d750b2989d7
-MD5 (patch-ab) = 4baf325a892e99b09dad571e6c3dfc5e
+MD5 (patch-ab) = e2ef65eedbdf616cda7ef927d655515f
diff --git a/devel/libglade/patches/patch-ab b/devel/libglade/patches/patch-ab
index 7a369284704..aae77519396 100644
--- a/devel/libglade/patches/patch-ab
+++ b/devel/libglade/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.2 1999/08/01 19:43:35 tron Exp $
+$NetBSD: patch-ab,v 1.3 1999/11/15 18:50:33 rh Exp $
---- doc/Makefile.in.orig Sun Jun 20 17:52:23 1999
-+++ doc/Makefile.in Sun Aug 1 21:27:49 1999
-@@ -128,7 +128,7 @@
+--- doc/Makefile.in.orig Tue Sep 28 07:24:35 1999
++++ doc/Makefile.in Mon Nov 15 19:47:58 1999
+@@ -127,7 +127,7 @@
# The directory containing the source code (if it contains documentation).
- DOC_SOURCE_DIR = $(top_srcdir)/glade
+ DOC_SOURCE_DIR = ../glade
-HTML_DIR = $(datadir)/gnome/html
+HTML_DIR = $(datadir)/doc
TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- @GNOME_SUPPORT_TRUE@CFLAGS = $(GNOME_INCLUDEDIR) $(XML_CFLAGS)
-@@ -294,8 +294,6 @@
+ @GNOME_SUPPORT_TRUE@CFLAGS = $(GNOME_INCLUDEDIR) $(XML_CFLAGS) -I$(srcdir)/..
+@@ -296,8 +296,6 @@
echo '-- Installing '$$i ; \
- $(INSTALL_DATA) $$i $(TARGET_DIR); \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
- echo '-- Installing $(srcdir)/html/index.sgml' ; \
- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(TARGET_DIR); \
diff --git a/devel/libhfs/files/patch-sum b/devel/libhfs/files/patch-sum
index 9add90883f3..05e2968ae0c 100644
--- a/devel/libhfs/files/patch-sum
+++ b/devel/libhfs/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/10/17 18:15:12 fredb Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/15 18:56:41 rh Exp $
MD5 (patch-aa) = e0af75d3b1b96457b615ebd39a1134e2
MD5 (patch-ab) = d877864417566b1386a29c9c3b3d90d7
-MD5 (patch-ac) = 7959a073b62ae605191e1892120eadda
-MD5 (patch-ad) = 5bb465dac273d80ef26ca44c1c8289cb
+MD5 (patch-ac) = 08fc4df4b14691309c509dca00338c71
+MD5 (patch-ad) = 706a55f5e13d5dbda032905474460d60
diff --git a/devel/libhfs/patches/patch-ac b/devel/libhfs/patches/patch-ac
index fde3f67d27c..fcd0a773e62 100644
--- a/devel/libhfs/patches/patch-ac
+++ b/devel/libhfs/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/10/17 04:28:19 fredb Exp $
+$NetBSD: patch-ac,v 1.2 1999/11/15 18:56:42 rh Exp $
---- libhfs/libhfs.h.orig Mon Nov 2 16:09:02 1998
-+++ libhfs/libhfs.h Fri Oct 15 12:53:29 1999
+--- libhfs/libhfs.h.orig Mon Nov 15 19:52:30 1999
++++ libhfs/libhfs.h Mon Nov 15 19:52:30 1999
@@ -19,8 +19,8 @@
- * $Id: patch-ac,v 1.1.1.1 1999/10/17 04:28:19 fredb Exp $
+ * $Id: patch-ac,v 1.2 1999/11/15 18:56:42 rh Exp $
*/
-# include "hfs.h"
diff --git a/devel/libhfs/patches/patch-ad b/devel/libhfs/patches/patch-ad
index 323e88308bf..bdf59cb0fe3 100644
--- a/devel/libhfs/patches/patch-ad
+++ b/devel/libhfs/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/10/17 04:28:19 fredb Exp $
+$NetBSD: patch-ad,v 1.2 1999/11/15 18:56:42 rh Exp $
---- librsrc/librsrc.h.orig Sat Apr 11 03:27:19 1998
-+++ librsrc/librsrc.h Fri Oct 15 12:55:15 1999
+--- librsrc/librsrc.h.orig Mon Nov 15 19:52:30 1999
++++ librsrc/librsrc.h Mon Nov 15 19:52:30 1999
@@ -19,7 +19,7 @@
- * $Id: patch-ad,v 1.1.1.1 1999/10/17 04:28:19 fredb Exp $
+ * $Id: patch-ad,v 1.2 1999/11/15 18:56:42 rh Exp $
*/
-# include "rsrc.h"
diff --git a/x11/gnome-libs/files/patch-sum b/x11/gnome-libs/files/patch-sum
index 21344dd687e..f467b177159 100644
--- a/x11/gnome-libs/files/patch-sum
+++ b/x11/gnome-libs/files/patch-sum
@@ -1,13 +1,13 @@
-$NetBSD: patch-sum,v 1.6 1999/11/01 22:21:24 tron Exp $
+$NetBSD: patch-sum,v 1.7 1999/11/15 18:47:56 rh Exp $
-MD5 (patch-aa) = 0e887f8a1c32d1aa0174f817ea9d1cfc
+MD5 (patch-aa) = 297c1d95ea741c6ab965bdde59827d1f
MD5 (patch-ab) = 911491cf3e32ffa67008d8d617f24a08
MD5 (patch-ac) = 2234ccfc4f168c91bb2fc8686ed0590c
MD5 (patch-ad) = c39cc321a208c5bf22aa8d07af9dd1a4
MD5 (patch-ae) = 1c36b5b59dd826c0d015d7d5d110ae44
MD5 (patch-af) = f14189c93bd7152e87cd5520823fc0d5
MD5 (patch-ag) = 44c356ffb86853b201740f377091e89b
-MD5 (patch-ah) = 3896b06bb0f1b552a5029097517667cc
+MD5 (patch-ah) = b36ca92cad14f1562229f0b507ac8c9e
MD5 (patch-ai) = baca2d5270e60252cf5e9406bd52064d
MD5 (patch-aj) = cb5dff8072ddfb84268ddf77453622e4
MD5 (patch-ak) = aef962961191617c236950a2e60a289b
diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 1a3ab3f33a3..9235315c8b1 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.6 1999/08/29 12:37:04 rh Exp $
+$NetBSD: patch-aa,v 1.7 1999/11/15 18:47:56 rh Exp $
---- configure.orig Fri Aug 20 21:45:13 1999
-+++ configure Sun Aug 29 12:56:36 1999
-@@ -2373,7 +2373,9 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+--- configure.orig Thu Oct 7 04:32:56 1999
++++ configure Mon Nov 15 19:18:04 1999
+@@ -2077,7 +2077,9 @@
+ fi
# Always use our own libtool.
+if false; then
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+fi
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -5653,7 +5655,7 @@
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags=
+@@ -5587,7 +5589,7 @@
# AM_GNOME_GETTEXT above substs $DATADIRNAME
# this is the directory where the *.{mo,gmo} files are installed
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.6 1999/08/29 12:37:04 rh Exp $
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-@@ -10310,7 +10312,7 @@
+@@ -10370,7 +10372,7 @@
GTKXMHTML_LIBS="-lgtkxmhtml $LIBGTKXMHTML_LIBS"
ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.6 1999/08/29 12:37:04 rh Exp $
GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
GNOME_IDLDIR='-I${datadir}/idl'
-@@ -10903,10 +10905,10 @@
+@@ -10967,10 +10969,10 @@
top_srcdir="$ac_dots$ac_given_srcdir" ;;
esac
@@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.6 1999/08/29 12:37:04 rh Exp $
echo creating "$ac_file"
rm -f "$ac_file"
-@@ -11176,10 +11178,10 @@
+@@ -11240,10 +11242,10 @@
*) # Relative path.
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
diff --git a/x11/gnome-libs/patches/patch-ah b/x11/gnome-libs/patches/patch-ah
index a2d89bb5f64..5f1a1fdd491 100644
--- a/x11/gnome-libs/patches/patch-ah
+++ b/x11/gnome-libs/patches/patch-ah
@@ -1,14 +1,14 @@
-$NetBSD: patch-ah,v 1.2 1999/08/29 12:37:04 rh Exp $
+$NetBSD: patch-ah,v 1.3 1999/11/15 18:47:56 rh Exp $
---- libart_lgpl/configure.orig Fri Aug 20 21:45:16 1999
-+++ libart_lgpl/configure Sun Aug 29 12:58:28 1999
-@@ -1922,7 +1922,9 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+--- libart_lgpl/configure.orig Mon Nov 15 19:20:56 1999
++++ libart_lgpl/configure Mon Nov 15 19:20:56 1999
+@@ -1624,7 +1624,9 @@
+ fi
# Always use our own libtool.
+if false; then
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+fi
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags=