diff options
-rw-r--r-- | x11/xscreensaver-gnome/Makefile | 5 | ||||
-rw-r--r-- | x11/xscreensaver/Makefile | 4 | ||||
-rw-r--r-- | x11/xscreensaver/Makefile.common | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index ed28a551a24..cc62790bf13 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/08/29 09:51:09 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/21 22:47:12 jlam Exp $ # PKGNAME= ${DISTNAME:S/-/-gnome-/} @@ -6,9 +6,6 @@ COMMENT= Screen saver and locker for the X window system (with GNOME support) CONFLICTS+= xscreensaver-[0-9]* -USE_BUILDLINK2= yes -USE_X11= yes - .include "../../x11/xscreensaver/Makefile.common" CONFIGURE_ARGS+= --with-gnome=${BUILDLINK_PREFIX.gnome-libs} diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index acd22f8a3a3..d84ac8e8a4d 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.49 2002/08/25 21:52:53 jlam Exp $ +# $NetBSD: Makefile,v 1.50 2002/09/21 22:47:11 jlam Exp $ # COMMENT= Screen saver and locker for the X window system CONFLICTS+= xscreensaver-gnome-[0-9]* -USE_BUILDLINK2= yes - .include "../../x11/xscreensaver/Makefile.common" CONFIGURE_ARGS+= --without-gnome diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index c981057a3ab..58b87f9850f 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2002/08/29 09:51:08 jlam Exp $ +# $NetBSD: Makefile.common,v 1.36 2002/09/21 22:47:11 jlam Exp $ # DISTNAME= xscreensaver-4.02 @@ -9,6 +9,7 @@ MASTER_SITES= ${HOMEPAGE} \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.jwz.org/xscreensaver/ +USE_BUILDLINK2= yes USE_X11BASE= yes GNU_CONFIGURE= yes |