Make two packages out of this. "xscreensaver" should be functionally

equivalent to the previous package; "xscreensaver-gnome" requires the
gnome-libs to build and run, and installs itself into the gnome CC.
This commit is contained in:
fredb 2000-06-03 19:07:29 +00:00
parent b2ee0fbc7e
commit 01fc7c344a
3 changed files with 63 additions and 47 deletions

View file

@ -0,0 +1,10 @@
# $NetBSD: Makefile,v 1.1 2000/06/03 19:07:30 fredb Exp $
#
PKGNAME= ${DISTNAME:S/-/-gnome-/}
DEPENDS+= control-center>=1.2.0:../../x11/controlcenter
CONFLICTS+= xscreensaver-[0-9]*
.include "../../x11/xscreensaver/Makefile.common"

View file

@ -1,52 +1,8 @@
# $NetBSD: Makefile,v 1.44 2000/06/02 20:21:18 fredb Exp $
# $NetBSD: Makefile,v 1.45 2000/06/03 19:07:29 fredb Exp $
#
DISTNAME= xscreensaver-3.24
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
CONFLICTS+= xscreensaver-gnome-[0-9]*
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.jwz.org/xscreensaver/
DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= Mesa-*:../../graphics/Mesa
DEPENDS+= gtk+-1.2.*:../../x11/gtk
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--without-shadow
CONFIGURE_ARGS+=--without-motif
CONFIGURE_ARGS+=--enable-subdir=${PREFIX}/libexec/xscreensaver
CONFIGURE_ARGS+=--with-zippy=/usr/games/fortune
CONFIGURE_ENV+= INSTALL=/usr/bin/install
USE_X11BASE= yes
USE_PERL5= yes
USE_XAW= yes
post-patch:
cd ${WRKSRC}/driver ; \
f=xscreensaver.kss ; \
[ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \
${SED} \
-e 's|@PREFIX@|${PREFIX}|g' \
<xscreensaver.kss.BAK >xscreensaver.kss
.include "../../mk/bsd.prefs.mk"
XAW_TYPE?= 3d
.if (${OPSYS} == "NetBSD")
.if defined(KERBEROS)
CFLAGS+= -I/usr/include/kerberosIV
.else
CONFIGURE_ARGS+=--without-kerberos
.endif
.endif
.if defined(USE_GNOME)
DEPENDS+= control-center>=1.2.0:../../x11/controlcenter
.else
CONFIGURE_ARGS+=--without-gnome
.endif
.include "../../mk/bsd.pkg.mk"
.include "../../x11/xscreensaver/Makefile.common"

View file

@ -0,0 +1,50 @@
# $NetBSD: Makefile.common,v 1.1 2000/06/03 19:07:30 fredb Exp $
#
DISTNAME= xscreensaver-3.24
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.jwz.org/xscreensaver/
DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= Mesa-*:../../graphics/Mesa
DEPENDS+= gtk+-1.2.*:../../x11/gtk
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--without-shadow
CONFIGURE_ARGS+=--without-motif
CONFIGURE_ARGS+=--enable-subdir=${PREFIX}/libexec/xscreensaver
CONFIGURE_ARGS+=--with-zippy=/usr/games/fortune
CONFIGURE_ENV+= INSTALL=/usr/bin/install
USE_X11BASE= yes
USE_PERL5= yes
USE_XAW= yes
FILESDIR= ${.CURDIR}/../../x11/xscreensaver/files
PATCHDIR= ${.CURDIR}/../../x11/xscreensaver/patches
PKGDIR= ${.CURDIR}/../../x11/xscreensaver/pkg
post-patch:
cd ${WRKSRC}/driver ; \
f=xscreensaver.kss ; \
[ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \
${SED} \
-e 's|@PREFIX@|${PREFIX}|g' \
<xscreensaver.kss.BAK >xscreensaver.kss
.include "../../mk/bsd.prefs.mk"
XAW_TYPE?= 3d
.if (${OPSYS} == "NetBSD")
.if defined(KERBEROS)
CFLAGS+= -I/usr/include/kerberosIV
.else
CONFIGURE_ARGS+=--without-kerberos
.endif
.endif
.include "../../mk/bsd.pkg.mk"