diff options
author | veego <veego> | 2005-02-21 21:24:06 +0000 |
---|---|---|
committer | veego <veego> | 2005-02-21 21:24:06 +0000 |
commit | b77a9f17853764c0277ee5e268e7140a8286750f (patch) | |
tree | 618ec29e74c872cba8dbd26983fabcd220c364f8 | |
parent | e5c7c998f98e5f27d26089b7e80335c827b669c6 (diff) | |
download | pkgsrc-b77a9f17853764c0277ee5e268e7140a8286750f.tar.gz |
Use the extended PLIST_SRC support which now also reads:
PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
and remove the package hack for MD PLIST files.
Rename PLIST.pre to PLIST.common and PLIST.post to PLIST.common_end
-rw-r--r-- | net/citrix_ica/Makefile | 6 | ||||
-rw-r--r-- | net/citrix_ica/PLIST.common (renamed from net/citrix_ica/PLIST.pre) | 2 | ||||
-rw-r--r-- | net/citrix_ica/PLIST.common_end (renamed from net/citrix_ica/PLIST.post) | 2 | ||||
-rw-r--r-- | print/acroread/Makefile | 6 | ||||
-rw-r--r-- | print/acroread/PLIST.common (renamed from print/acroread/PLIST.pre) | 2 | ||||
-rw-r--r-- | print/acroread/PLIST.common_end (renamed from print/acroread/PLIST.post) | 2 | ||||
-rw-r--r-- | print/acroread5/Makefile | 8 | ||||
-rw-r--r-- | print/acroread5/PLIST.common (renamed from print/acroread5/PLIST.pre) | 2 | ||||
-rw-r--r-- | print/acroread5/PLIST.common_end (renamed from print/acroread5/PLIST.post) | 2 |
9 files changed, 9 insertions, 23 deletions
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile index 7ec5d0d13ca..90967d6433f 100644 --- a/net/citrix_ica/Makefile +++ b/net/citrix_ica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/02/20 12:58:09 grant Exp $ +# $NetBSD: Makefile,v 1.20 2005/02/21 21:24:06 veego Exp $ # # A default so lintpkgsrc is happy, overridden below @@ -45,10 +45,6 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} -PLIST_SRC= ${PKGDIR}/PLIST.pre \ - ${PKGDIR}/PLIST.${MACHINE_ARCH} \ - ${PKGDIR}/PLIST.post - WRKSRC= ${WRKDIR} DIST_SUBDIR= ${PKGNAME} diff --git a/net/citrix_ica/PLIST.pre b/net/citrix_ica/PLIST.common index 13b27feaecf..768bb90830b 100644 --- a/net/citrix_ica/PLIST.pre +++ b/net/citrix_ica/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.pre,v 1.4 2003/08/11 10:39:41 markd Exp $ +@comment $NetBSD: PLIST.common,v 1.1 2005/02/21 21:24:06 veego Exp $ bin/wfcmgr bin/wfica lib/ICAClient/.config/appsrv.ini diff --git a/net/citrix_ica/PLIST.post b/net/citrix_ica/PLIST.common_end index c4e849a7c87..76ba5b1406d 100644 --- a/net/citrix_ica/PLIST.post +++ b/net/citrix_ica/PLIST.common_end @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.post,v 1.3 2003/08/11 10:39:41 markd Exp $ +@comment $NetBSD: PLIST.common_end,v 1.1 2005/02/21 21:24:06 veego Exp $ @dirrm lib/ICAClient/.config @dirrm lib/ICAClient/config @dirrm lib/ICAClient/cache/zlcache diff --git a/print/acroread/Makefile b/print/acroread/Makefile index 444f85ad8a0..655ef217be0 100644 --- a/print/acroread/Makefile +++ b/print/acroread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2004/12/21 15:32:03 xtraeme Exp $ +# $NetBSD: Makefile,v 1.40 2005/02/21 21:24:06 veego Exp $ DISTNAME= acroread # Overridden below PKGNAME= acroread-4.05 @@ -60,10 +60,6 @@ post-patch: PLIST_SUBST+= PLATFORM=${PLATFORM} -PLIST_SRC= ${PKGDIR}/PLIST.pre \ - ${PKGDIR}/PLIST.${MACHINE_ARCH} \ - ${PKGDIR}/PLIST.post - NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins BIN_PATCH= ${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig diff --git a/print/acroread/PLIST.pre b/print/acroread/PLIST.common index 72dc358ef74..ad334ea6196 100644 --- a/print/acroread/PLIST.pre +++ b/print/acroread/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.pre,v 1.2 2004/12/21 15:32:03 xtraeme Exp $ +@comment $NetBSD: PLIST.common,v 1.1 2005/02/21 21:24:06 veego Exp $ Acrobat4/Browsers/netscape Acrobat4/Browsers/${PLATFORM}/nppdf.so Acrobat4/ReadMe diff --git a/print/acroread/PLIST.post b/print/acroread/PLIST.common_end index aa2eb3b4e0f..530a8f60383 100644 --- a/print/acroread/PLIST.post +++ b/print/acroread/PLIST.common_end @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.post,v 1.4 2002/12/09 16:01:36 tron Exp $ +@comment $NetBSD: PLIST.common_end,v 1.1 2005/02/21 21:24:06 veego Exp $ @exec ${MKDIR} %D/lib/netscape/plugins @unexec ${RMDIR} %D/lib/netscape/plugins 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/lib/netscape 2>/dev/null || ${TRUE} diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile index caaadfaab25..8a68586da6b 100644 --- a/print/acroread5/Makefile +++ b/print/acroread5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/12/21 02:58:59 xtraeme Exp $ +# $NetBSD: Makefile,v 1.26 2005/02/21 21:24:06 veego Exp $ DISTNAME= acroread5 # Overridden below PKGNAME= acroread5-5.10 @@ -59,12 +59,6 @@ PLATFORM= sparcsolaris PLIST_SUBST+= PLATFORM=${PLATFORM} -PLIST_SRC= ${PKGDIR}/PLIST.pre -.if ${MACHINE_ARCH} == "sparc" -PLIST_SRC+= ${PKGDIR}/PLIST.${MACHINE_ARCH} -.endif -PLIST_SRC+= ${PKGDIR}/PLIST.post - BIN_PATCH= ${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig do-install: diff --git a/print/acroread5/PLIST.pre b/print/acroread5/PLIST.common index e95ef317d09..acf29080992 100644 --- a/print/acroread5/PLIST.pre +++ b/print/acroread5/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.pre,v 1.5 2004/12/21 02:58:59 xtraeme Exp $ +@comment $NetBSD: PLIST.common,v 1.1 2005/02/21 21:24:06 veego Exp $ Acrobat5/Browsers/netscape Acrobat5/Browsers/${PLATFORM}/nppdf.so Acrobat5/Reader/AcroVersion diff --git a/print/acroread5/PLIST.post b/print/acroread5/PLIST.common_end index ce55648096f..822b2edea8c 100644 --- a/print/acroread5/PLIST.post +++ b/print/acroread5/PLIST.common_end @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.post,v 1.3 2003/05/07 11:28:01 jmmv Exp $ +@comment $NetBSD: PLIST.common_end,v 1.1 2005/02/21 21:24:06 veego Exp $ @exec ln -sf ../../Resource/Font %D/Acrobat5/Reader/${PLATFORM}/fonts @unexec ${RM} -f %D/Acrobat5/Reader/${PLATFORM}/fonts @exec ln -sf ../res %D/Acrobat5/Reader/${PLATFORM}/res |