diff options
| author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
| commit | 9ff693053b2b42cd6a29b886e071ad01acdeefe2 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /pkgtools/xpkgwedge | |
| parent | 4a580ef74536ed1f7c6a7ecd5a26e46a93aec9b3 (diff) | |
| download | pkgsrc-9ff693053b2b42cd6a29b886e071ad01acdeefe2.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'pkgtools/xpkgwedge')
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 19 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/PLIST | 10 |
2 files changed, 12 insertions, 17 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index 22e4404abdb..0174c0b8f1f 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2007/12/16 12:43:50 tron Exp $ +# $NetBSD: Makefile,v 1.75 2008/04/12 22:43:09 jlam Exp $ DISTNAME= xpkgwedge-1.16 CATEGORIES= pkgtools devel x11 @@ -44,29 +44,24 @@ FILES_SUBST+= FONT_PROGS=${FONT_PROGS:Q} FILES_SUBST+= MAKE=${IMAKE_MAKE:Q} USE_TOOLS+= ${IMAKE_TOOLS} +PLIST_VARS+= Darwin IRIX IRIX5 IRIX6 + .if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) APPLY_DARWIN_PATCH= ${TRUE} -PLIST_SUBST+= IS_DARWIN= +PLIST.Darwin= yes USE_TOOLS+= patch .else APPLY_DARWIN_PATCH= ${FALSE} -PLIST_SUBST+= IS_DARWIN="@comment " .endif .if ${OPSYS} == "IRIX" -PLIST_SUBST+= IS_IRIX= +PLIST.IRIX= yes USE_TOOLS+= patch . if !empty(OS_VERSION:M6*) -PLIST_SUBST+= IS_IRIX5="@comment " -PLIST_SUBST+= IS_IRIX6= +PLIST.IRIX6= yes . else -PLIST_SUBST+= IS_IRIX5= -PLIST_SUBST+= IS_IRIX6="@comment " +PLIST.IRIX5= yes . endif -.else -PLIST_SUBST+= IS_IRIX="@comment " -PLIST_SUBST+= IS_IRIX5="@comment " -PLIST_SUBST+= IS_IRIX6="@comment " .endif .include "../../mk/x11.buildlink3.mk" diff --git a/pkgtools/xpkgwedge/PLIST b/pkgtools/xpkgwedge/PLIST index adfbe44ebbd..16d1b446644 100644 --- a/pkgtools/xpkgwedge/PLIST +++ b/pkgtools/xpkgwedge/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.6 2006/09/09 20:31:46 schwarz Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:09 jlam Exp $ bin/pkgxmkmf lib/X11/config/xpkgwedge.def -${IS_DARWIN}lib/X11/config/darwin.cf -${IS_IRIX}lib/X11/config/sgi.cf -${IS_IRIX5}lib/X11/config/sgiLib.rules -${IS_IRIX6}lib/X11/config/X11.rules +${PLIST.Darwin}lib/X11/config/darwin.cf +${PLIST.IRIX}lib/X11/config/sgi.cf +${PLIST.IRIX5}lib/X11/config/sgiLib.rules +${PLIST.IRIX6}lib/X11/config/X11.rules |