summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2008-04-13 13:15:59 +0000
committertnn <tnn@pkgsrc.org>2008-04-13 13:15:59 +0000
commit35789f1c5d65a0900690598e59924545cd5486b9 (patch)
treebcdf337d4df77c55dbe79a6831f98457f85cb474
parentb74cafda065ea871dd64c181f3e17a623a126567 (diff)
downloadpkgsrc-35789f1c5d65a0900690598e59924545cd5486b9.tar.gz
Convert previous to PLIST_VARS.
-rw-r--r--devel/glib2/Makefile7
-rw-r--r--devel/glib2/PLIST4
2 files changed, 5 insertions, 6 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index d565a7ed4e2..8e64b73ee6e 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2008/04/13 05:31:16 tnn Exp $
+# $NetBSD: Makefile,v 1.134 2008/04/13 13:15:59 tnn Exp $
# When updating glib2, please apply patch-ak to configure.in
# Then run a matching version of autoconf to regen patch-aa.
@@ -98,12 +98,11 @@ CONFIGURE_ARGS+= --disable-threads
.include "../../mk/pthread.buildlink3.mk"
.endif
.include "../../devel/pcre/buildlink3.mk"
-
+PLIST_VARS+= fam
.if ${OPSYS} == "HPUX"
-PLIST_SUBST+= FAM="@comment "
CONFIGURE_ARGS+= --disable-fam
.else
-PLIST_SUBST+= FAM=""
+PLIST.fam= yes
FAM_ACCEPTED= fam
. include "../../mk/fam.buildlink3.mk"
.endif
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index f8e6be54a94..3e8799c5d6d 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2008/04/13 05:31:16 tnn Exp $
+@comment $NetBSD: PLIST,v 1.41 2008/04/13 13:15:59 tnn Exp $
bin/glib-genmarshal
bin/glib-gettextize
bin/glib-mkenums
@@ -128,7 +128,7 @@ include/glib/glib-2.0/gobject/gvalue.h
include/glib/glib-2.0/gobject/gvaluearray.h
include/glib/glib-2.0/gobject/gvaluecollector.h
include/glib/glib-2.0/gobject/gvaluetypes.h
-${FAM}lib/gio/modules/libgiofam.la
+${PLIST.fam}lib/gio/modules/libgiofam.la
lib/glib-2.0/include/glibconfig.h
lib/libgio-2.0.la
lib/libglib-2.0.la