diff options
author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
commit | a020ed9056d4d74e13cd2a99898f3dec09c162b7 (patch) | |
tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /x11/xscreensaver/patches | |
parent | 287b5c5601b23446d25c27bbf0140c8dc4b4391e (diff) | |
download | pkgsrc-a020ed9056d4d74e13cd2a99898f3dec09c162b7.tar.gz |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'x11/xscreensaver/patches')
-rw-r--r-- | x11/xscreensaver/patches/patch-aa | 20 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-af | 20 |
2 files changed, 4 insertions, 36 deletions
diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa index 497ea96b734..67a2fd60c62 100644 --- a/x11/xscreensaver/patches/patch-aa +++ b/x11/xscreensaver/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.21 2002/06/01 22:02:48 wiz Exp $ +$NetBSD: patch-aa,v 1.22 2002/08/25 21:52:55 jlam Exp $ --- configure.orig Mon Mar 18 18:42:35 2002 +++ configure @@ -20,23 +20,7 @@ $NetBSD: patch-aa,v 1.21 2002/06/01 22:02:48 wiz Exp $ if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" echo "$ac_t""$d" 1>&6 -@@ -10635,15 +10635,6 @@ - DEPEND_DEFINES= - - --if test \! -z "$includedir" ; then -- INCLUDES="$INCLUDES -I$includedir" --fi -- --if test \! -z "$libdir" ; then -- LDFLAGS="$LDFLAGS -L$libdir" --fi -- -- - PREFERRED_DEMO_PROGRAM=xscreensaver-demo-Xm - ALL_DEMO_PROGRAMS= - if test "$have_motif" = yes; then -@@ -10745,7 +10736,7 @@ +@@ -10745,7 +10745,7 @@ GTK_ICONDIR='$(GNOME_DATADIR)/pixmaps' elif test "$have_gtk" = yes; then # should this be "$(prefix)/share/pixmaps"? But /usr/X11R6/share/ is wrong... diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af index 9e68d7bc9cf..2896e33bdde 100644 --- a/x11/xscreensaver/patches/patch-af +++ b/x11/xscreensaver/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.8 2002/04/09 22:50:02 jlam Exp $ +$NetBSD: patch-af,v 1.9 2002/08/25 21:52:55 jlam Exp $ --- configure.in.orig Mon Mar 18 18:01:26 2002 +++ configure.in @@ -11,23 +11,7 @@ $NetBSD: patch-af,v 1.8 2002/04/09 22:50:02 jlam Exp $ elif test "$have_kerberos" = yes ; then # from Tim Showalter <tjs@psaux.com> for FreeBSD 4.2 PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err" -@@ -2878,15 +2878,6 @@ - DEPEND_DEFINES= - - --if test \! -z "$includedir" ; then -- INCLUDES="$INCLUDES -I$includedir" --fi -- --if test \! -z "$libdir" ; then -- LDFLAGS="$LDFLAGS -L$libdir" --fi -- -- - PREFERRED_DEMO_PROGRAM=xscreensaver-demo-Xm - ALL_DEMO_PROGRAMS= - if test "$have_motif" = yes; then -@@ -2988,7 +2979,7 @@ +@@ -2988,7 +2988,7 @@ GTK_ICONDIR='$(GNOME_DATADIR)/pixmaps' elif test "$have_gtk" = yes; then # should this be "$(prefix)/share/pixmaps"? But /usr/X11R6/share/ is wrong... |