summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-08-26 17:39:32 +0000
committerjlam <jlam@pkgsrc.org>2002-08-26 17:39:32 +0000
commit2483ebd6aad0064a405485373a304b3c8e556d4b (patch)
treea6b953a1dda2bbf2430bed7d1208caaaf4a8fc94 /x11
parent0379224e9053ff159df857fb54e38de4d0f92028 (diff)
downloadpkgsrc-2483ebd6aad0064a405485373a304b3c8e556d4b.tar.gz
Allow the common Makefile to be shared between xscreensaver, which uses
buildlink2, and xscreensaver-gnome, which uses buildlink1.
Diffstat (limited to 'x11')
-rw-r--r--x11/xscreensaver/Makefile.common16
1 files changed, 15 insertions, 1 deletions
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 0add1320539..bb0e8a8604c 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2002/08/25 21:52:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.34 2002/08/26 17:39:32 jlam Exp $
#
DISTNAME= xscreensaver-4.02
@@ -15,10 +15,17 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver
CONFIGURE_ARGS+= --with-gl
CONFIGURE_ARGS+= --with-gle
+.if defined(USE_BUILDLINK2)
CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk}
CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg}
CONFIGURE_ARGS+= --with-gdk-pixbuf=${BUILDLINK_PREFIX.gdk-pixbuf}
CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml}
+.else
+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}
+.endif
CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune
CONFIGURE_ARGS+= --without-motif
@@ -59,7 +66,14 @@ post-patch:
[ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \
${SED} -e 's|@PREFIX@|${PREFIX}|g' < $$f.BAK > $$f
+.if defined(USE_BUILDLINK2)
.include "../../graphics/gdk-pixbuf/buildlink2.mk"
.include "../../graphics/gle/buildlink2.mk"
.include "../../textproc/libxml/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
+.else
+.include "../../graphics/gdk-pixbuf/buildlink.mk"
+.include "../../graphics/gle/buildlink.mk"
+.include "../../textproc/libxml/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
+.endif