diff options
author | jlam <jlam> | 2002-04-09 22:50:02 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-04-09 22:50:02 +0000 |
commit | be4a1808c7cac74f1a0cf0e80a9af6a9f337d1f4 (patch) | |
tree | bbb4a9577e130899eb8b65f114988a771306c179 /x11/xscreensaver | |
parent | 6133cc0c284b291f22564227ef495af8b3c98cdb (diff) | |
download | pkgsrc-be4a1808c7cac74f1a0cf0e80a9af6a9f337d1f4.tar.gz |
Strongly buildlinkify.
Diffstat (limited to 'x11/xscreensaver')
-rw-r--r-- | x11/xscreensaver/Makefile | 9 | ||||
-rw-r--r-- | x11/xscreensaver/Makefile.common | 57 | ||||
-rw-r--r-- | x11/xscreensaver/distinfo | 6 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-aa | 22 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-af | 22 |
5 files changed, 74 insertions, 42 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 35c2d7a0955..f6cc2480548 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,11 +1,16 @@ -# $NetBSD: Makefile,v 1.47 2002/02/09 21:12:56 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2002/04/09 22:50:02 jlam Exp $ # COMMENT= Screen saver and locker for the X window system CONFLICTS+= xscreensaver-gnome-[0-9]* +USE_BUILDLINK_ONLY= yes + +.include "../../x11/xscreensaver/Makefile.common" + CONFIGURE_ARGS+= --without-gnome CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config -.include "../../x11/xscreensaver/Makefile.common" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 85d2f9bc1ff..507facbb8f2 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2002/04/05 12:05:31 skrll Exp $ +# $NetBSD: Makefile.common,v 1.30 2002/04/09 22:50:02 jlam Exp $ # DISTNAME= xscreensaver-4.02 @@ -9,30 +9,25 @@ MASTER_SITES= ${HOMEPAGE} \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.jwz.org/xscreensaver/ -DEPENDS+= gtk+-1.2.*:../../x11/gtk -DEPENDS+= gle-[0-9]*:../../graphics/gle -DEPENDS+= gdk-pixbuf>=0.11.0nb1:../../graphics/gdk-pixbuf -DEPENDS+= jpeg-6b:../../graphics/jpeg -DEPENDS+= libxml-1.8.16:../../textproc/libxml - -USE_MESA= yes USE_X11BASE= yes -EVAL_PREFIX+= GTKDIR=gtk+ - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver -CONFIGURE_ARGS+= --with-gl --with-gle -CONFIGURE_ARGS+= --with-gtk=${GTKDIR} -CONFIGURE_ARGS+= --with-jpeg=${LOCALBASE} +CONFIGURE_ARGS+= --with-gl +CONFIGURE_ARGS+= --with-gle +CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-gdk-pixbuf=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-xml=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune + 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 -CONFIGURE_ENV+= ac_cv_x_app_defaults="${X11PREFIX}/lib/X11/app-defaults" -CONFIGURE_ENV+= PERL="${PERL}" ac_cv_perl_version="${PERL_VERSION}" +CONFIGURE_ENV+= ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults" +CONFIGURE_ENV+= PERL="${PERL5}" ac_cv_perl_version="${PERL_VERSION}" MAKE_ENV+= KDEDIR=${X11PREFIX} DISTINFO_FILE= ${.CURDIR}/../xscreensaver/distinfo @@ -40,14 +35,13 @@ FILESDIR= ${.CURDIR}/../xscreensaver/files PATCHDIR= ${.CURDIR}/../xscreensaver/patches PKGDIR= ${.CURDIR}/../xscreensaver -post-patch: - cd ${WRKSRC}/driver ; \ - f=xscreensaver.kss ; \ - [ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \ - ${SED} -e 's|@PREFIX@|${PREFIX}|g' < $$f.BAK > $$f - .include "../../mk/bsd.prefs.mk" +.ifndef (PERL_VERSION) +PERL_VERSION!= if [ -x ${PERL5} ]; then ${PERL5} -e 'print $$]'; else ${ECHO} "5.006"; fi +MAKEFLAGS+= PERL_VERSION="${PERL_VERSION}" +.endif + .if (${OPSYS} == "NetBSD") .if defined(KERBEROS) CFLAGS+= -I/usr/include/kerberosIV @@ -56,12 +50,13 @@ CONFIGURE_ARGS+= --without-kerberos .endif .endif -.include "../../mk/bsd.pkg.mk" - -# this has to come after bsd.pkg.mk for ${ECHO}. +post-patch: + cd ${WRKSRC}/driver ; \ + f=xscreensaver.kss ; \ + [ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \ + ${SED} -e 's|@PREFIX@|${PREFIX}|g' < $$f.BAK > $$f -PERL?= ${LOCALBASE}/bin/perl -.ifndef (PERL_VERSION) -PERL_VERSION!= if [ -x ${PERL} ]; then ${PERL} -e 'print $$]'; else ${ECHO} "5.006"; fi -MAKEFLAGS+= PERL_VERSION="${PERL_VERSION}" -.endif +.include "../../graphics/gdk-pixbuf/buildlink.mk" +.include "../../graphics/gle/buildlink.mk" +.include "../../textproc/libxml/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 270927fcafa..df6da10fed5 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2002/04/06 11:16:43 wiz Exp $ +$NetBSD: distinfo,v 1.18 2002/04/09 22:50:02 jlam Exp $ SHA1 (xscreensaver-4.02.tar.gz) = b32cf3ed37680669a4a7ea2b945fadb5841fc6b3 Size (xscreensaver-4.02.tar.gz) = 2201442 bytes -SHA1 (patch-aa) = 48beab31e1528d5d0234a662258ee589384dce71 +SHA1 (patch-aa) = 0ee5aa8c2683d85dfa9106f3633c457e2d271e5e SHA1 (patch-ab) = 3f60a99f7d45f38b6c4afe2fcc6eafc9456acb30 SHA1 (patch-ac) = 4f201f01b65935c57efa7bfec8291f29a7ff1280 SHA1 (patch-ae) = 9209256c4dcc7bde3dd812bb8fcbad1f8b4f0f08 -SHA1 (patch-af) = bebfa87e2df4f27221d701898c820bbdda3e6316 +SHA1 (patch-af) = f8b0d2b06d08cdbc128dec8f6342a6489c7824e6 diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa index 31c17788062..86322437f6e 100644 --- a/x11/xscreensaver/patches/patch-aa +++ b/x11/xscreensaver/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.19 2002/04/06 11:16:43 wiz Exp $ +$NetBSD: patch-aa,v 1.20 2002/04/09 22:50:02 jlam Exp $ ---- configure.orig Tue Mar 19 00:42:35 2002 +--- configure.orig Mon Mar 18 18:42:35 2002 +++ configure @@ -1638,7 +1638,7 @@ # implement the "install-strip" target properly (strip executables, @@ -29,7 +29,23 @@ $NetBSD: patch-aa,v 1.19 2002/04/06 11:16:43 wiz Exp $ if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" echo "$ac_t""$d" 1>&6 -@@ -10745,7 +10745,7 @@ +@@ -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 @@ 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 732a7ecfc63..9e68d7bc9cf 100644 --- a/x11/xscreensaver/patches/patch-af +++ b/x11/xscreensaver/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.7 2002/04/06 11:16:44 wiz Exp $ +$NetBSD: patch-af,v 1.8 2002/04/09 22:50:02 jlam Exp $ ---- configure.in.orig Tue Mar 19 00:01:26 2002 +--- configure.in.orig Mon Mar 18 18:01:26 2002 +++ configure.in @@ -1512,7 +1512,7 @@ if test "$have_kerberos5" = yes ; then @@ -11,7 +11,23 @@ $NetBSD: patch-af,v 1.7 2002/04/06 11:16:44 wiz 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" -@@ -2988,7 +2988,7 @@ +@@ -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 @@ GTK_ICONDIR='$(GNOME_DATADIR)/pixmaps' elif test "$have_gtk" = yes; then # should this be "$(prefix)/share/pixmaps"? But /usr/X11R6/share/ is wrong... |