diff options
| -rw-r--r-- | x11/xscreensaver/Makefile.common | 12 | ||||
| -rw-r--r-- | x11/xscreensaver/PLIST | 3 | ||||
| -rw-r--r-- | x11/xscreensaver/distinfo | 4 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-aa | 13 |
4 files changed, 22 insertions, 10 deletions
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 0efe6f2c65b..cfe3c5ebf1e 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2002/02/24 21:42:55 wiz Exp $ +# $NetBSD: Makefile.common,v 1.24 2002/03/01 06:46:49 fredb Exp $ # DISTNAME= xscreensaver-4.01 @@ -11,21 +11,23 @@ HOMEPAGE= http://www.jwz.org/xscreensaver/ DEPENDS+= gtk+-1.2.*:../../x11/gtk DEPENDS+= gle-[0-9]*:../../graphics/gle +DEPENDS+= gdk-pixbuf>=0.10.1:../../graphics/gdk-pixbuf +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= libxml-1.8.16:../../texproc/libxml USE_MESA= yes USE_X11BASE= yes -USE_XPM= yes EVAL_PREFIX+= GTKDIR=gtk+ -EVAL_PREFIX+= XPMDIR=xpm GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver -CONFIGURE_ARGS+= --with-gl +CONFIGURE_ARGS+= --with-gl --with-gle CONFIGURE_ARGS+= --with-gtk=${GTKDIR} -CONFIGURE_ARGS+= --with-xpm=${XPMDIR} +CONFIGURE_ARGS+= --with-jpeg=${LOCALBASE} CONFIGURE_ARGS+= --without-motif CONFIGURE_ARGS+= --without-shadow +CONFIGURE_ARGS+= --with-xml=${LOCALBASE} CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune CONFIGURE_ENV+= INSTALL=/usr/bin/install CONFIGURE_ENV+= X_PRE_LIBS=-lXt diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST index ffe2db9e194..b627e0fd62b 100644 --- a/x11/xscreensaver/PLIST +++ b/x11/xscreensaver/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/02/24 21:42:56 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/03/01 06:46:49 fredb Exp $ bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-demo @@ -285,6 +285,7 @@ libexec/xscreensaver/vidwhacker libexec/xscreensaver/vines libexec/xscreensaver/wander libexec/xscreensaver/webcollage +libexec/xscreensaver/webcollage-helper libexec/xscreensaver/whirlwindwarp libexec/xscreensaver/whirlygig libexec/xscreensaver/worm diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index ebfa8157f0e..e7798ad0e22 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2002/02/24 21:42:56 wiz Exp $ +$NetBSD: distinfo,v 1.11 2002/03/01 06:46:49 fredb Exp $ SHA1 (xscreensaver-4.01.tar.gz) = 09f087d653c9c8d6b3777aa3f348c5e2f7217686 Size (xscreensaver-4.01.tar.gz) = 2156101 bytes -SHA1 (patch-aa) = de4fb926398ee76d4d30960ee12f731eb3a03919 +SHA1 (patch-aa) = f2c8ac0ffeb0f8aab546362caf3084bcfc31309a SHA1 (patch-ab) = 3f60a99f7d45f38b6c4afe2fcc6eafc9456acb30 SHA1 (patch-ac) = 0408f5f6ddf3ea80a981c223ab41f7464c4e1357 SHA1 (patch-ad) = e245611bfd7de949a788fe38f9bcc99b52f286c7 diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa index 6bf2f540251..40ef4598b11 100644 --- a/x11/xscreensaver/patches/patch-aa +++ b/x11/xscreensaver/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.15 2002/02/24 21:42:56 wiz Exp $ +$NetBSD: patch-aa,v 1.16 2002/03/01 06:46:50 fredb Exp $ ---- configure.orig Sun Feb 24 10:56:28 2002 +--- configure.orig Sun Feb 24 03:56:28 2002 +++ configure @@ -1544,7 +1544,7 @@ # implement the "install-strip" target properly (strip executables, @@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.15 2002/02/24 21:42:56 wiz Exp $ # random libc stuff echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +@@ -7479,7 +7479,7 @@ + /*) + echo $ac_n "checking for XML headers""... $ac_c" 1>&6 + echo "configure:7493: checking for XML headers" >&5 +- d=$with_xml/include ++ d=$with_xml/include/gnome-xml + if test -d $d; then + X_CFLAGS="-I$d $X_CFLAGS" + echo "$ac_t""$d" 1>&6 |