diff options
author | agc <agc> | 1998-09-04 22:14:25 +0000 |
---|---|---|
committer | agc <agc> | 1998-09-04 22:14:25 +0000 |
commit | 3add1d60799235dad0ffd1e38c28bb5554f14177 (patch) | |
tree | f7fcf6586d7c797b841761ebe5ea33394cfafc5f /x11/gnome-libs/patches | |
parent | a10fe90002f9046025783f94dbb3b34a68c70bae (diff) | |
download | pkgsrc-3add1d60799235dad0ffd1e38c28bb5554f14177.tar.gz |
Addition of gnome-libs-0.27, the libaries for the GNU Network Object
Model Environment, to the NetBSD packages collection.
Diffstat (limited to 'x11/gnome-libs/patches')
-rw-r--r-- | x11/gnome-libs/patches/patch-aa | 64 | ||||
-rw-r--r-- | x11/gnome-libs/patches/patch-ab | 13 | ||||
-rw-r--r-- | x11/gnome-libs/patches/patch-ac | 22 | ||||
-rw-r--r-- | x11/gnome-libs/patches/patch-ad | 15 |
4 files changed, 114 insertions, 0 deletions
diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa new file mode 100644 index 00000000000..9b1efc03b24 --- /dev/null +++ b/x11/gnome-libs/patches/patch-aa @@ -0,0 +1,64 @@ +$NetBSD: patch-aa,v 1.1 1998/09/04 22:14:26 agc Exp $ + +Use our own version of libtool +Set CPPFLAGS correctly so that it finds all the pre-req header files +Comment out erroneous settings of the INSTALL variable. + +--- configure.orig Fri Aug 7 02:01:30 1998 ++++ configure Fri Aug 14 14:59:42 1998 +@@ -78,6 +78,9 @@ + # Initialize some other variables. + subdirs= + MFLAGS= MAKEFLAGS= ++CFLAGS="-I../intl -I$X11BASE/include -I$LOCALBASE/include" ++CPPFLAGS="-I../intl -I$X11BASE/include -I$LOCALBASE/include -I$LOCALBASE/include/giflib" ++LDFLAGS="-L$X11BASE/lib -L$LOCALBASE/lib" + # Maximum number of lines to put in a shell here document. + ac_max_here_lines=12 + +@@ -1621,6 +1624,7 @@ + + + # Always use our own libtool. ++if false; then + LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + +@@ -1700,6 +1704,7 @@ + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } ++fi + + + echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +@@ -6711,10 +6716,10 @@ + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac ++# case "$ac_given_INSTALL" in ++# [/$]*) INSTALL="$ac_given_INSTALL" ;; ++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++# esac + + echo creating "$ac_file" + rm -f "$ac_file" +@@ -6980,10 +6985,10 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac ++# case "$ac_given_INSTALL" in ++# [/$]*) INSTALL="$ac_given_INSTALL" ;; ++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++# esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/x11/gnome-libs/patches/patch-ab b/x11/gnome-libs/patches/patch-ab new file mode 100644 index 00000000000..fbf9f58cfbf --- /dev/null +++ b/x11/gnome-libs/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 1998/09/04 22:14:26 agc Exp $ + +--- libgnomeui/Makefile.in.orig Sat Aug 15 15:49:03 1998 ++++ libgnomeui/Makefile.in Sat Aug 15 15:48:19 1998 +@@ -349,7 +349,7 @@ + ted_demo_DEPENDENCIES = $(top_builddir)/libgnomeui/libgnomeui.la \ + $(top_builddir)/libgnome/libgnome.la + ted_demo_LDFLAGS = +-stock_demo_OBJECTS = stock_demo.o ++stock_demo_OBJECTS = stock_demo.o gnome-stock.o + stock_demo_DEPENDENCIES = $(top_builddir)/libgnomeui/libgnomeui.la \ + $(top_builddir)/libgnome/libgnome.la + stock_demo_LDFLAGS = diff --git a/x11/gnome-libs/patches/patch-ac b/x11/gnome-libs/patches/patch-ac new file mode 100644 index 00000000000..280a6876556 --- /dev/null +++ b/x11/gnome-libs/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 1998/09/04 22:14:26 agc Exp $ + +Use NetBSD's libtool + +--- libgtktty/configure 1998/09/01 21:20:44 1.1 ++++ libgtktty/configure 1998/09/01 21:21:08 +@@ -1936,6 +1936,7 @@ + + + # Always use our own libtool. ++if false; then + LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + +@@ -2015,6 +2016,7 @@ + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } ++fi + + + diff --git a/x11/gnome-libs/patches/patch-ad b/x11/gnome-libs/patches/patch-ad new file mode 100644 index 00000000000..829a6ad08a6 --- /dev/null +++ b/x11/gnome-libs/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 1998/09/04 22:14:26 agc Exp $ + +Don't try to strip a script. + +--- Makefile.in 1998/09/02 07:47:48 1.1 ++++ Makefile.in 1998/09/02 07:47:53 +@@ -51,7 +51,7 @@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} + transform = @program_transform_name@ + + NORMAL_INSTALL = : |