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.pro to PLIST.common and PLIST.post to PLIST.common_end
and rename the PLIST.* files from ${LOWER_OPSYS} to ${OPSYS}.

7 files changed, 7 insertions, 10 deletions

diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile
index 116d95767e1..37dab6ad720 100644
--- a/print/acroread3/Makefile
+++ b/print/acroread3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/20 12:24:28 agc Exp $
+# $NetBSD: Makefile,v 1.26 2005/02/21 21:26:15 veego Exp $
 
 PKGNAME=	acroread3-3.01
 CATEGORIES=	print
@@ -57,9 +57,6 @@ DISTNAME=	${PKGNAME}
 LDD?=		${TRUE}
 .endif
 
-PLIST_SRC=	${PKGDIR}/PLIST.pre \
-		${PKGDIR}/PLIST.${LOWER_OPSYS}-${MACHINE_ARCH} \
-		${PKGDIR}/PLIST.post
 PLIST_SUBST+=	PLATFORM=${PLATFORM}
 
 pre-install:
diff --git a/print/acroread3/PLIST.netbsd-i386 b/print/acroread3/PLIST.NetBSD-alpha
index e1a544a6452..bcef6f68106 100644
--- a/print/acroread3/PLIST.netbsd-i386
+++ b/print/acroread3/PLIST.NetBSD-alpha
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.netbsd-i386,v 1.1 2001/10/31 23:31:15 zuntum Exp $
+@comment $NetBSD: PLIST.NetBSD-alpha,v 1.1 2005/02/21 21:26:15 veego Exp $
 Acrobat3/Reader/${PLATFORM}/lib/libagm.so
 Acrobat3/Reader/${PLATFORM}/lib/libagm.so.2.0
 Acrobat3/Reader/${PLATFORM}/lib/libpfs.so
diff --git a/print/acroread3/PLIST.netbsd-alpha b/print/acroread3/PLIST.NetBSD-i386
index 6818b044555..c208c0c71a8 100644
--- a/print/acroread3/PLIST.netbsd-alpha
+++ b/print/acroread3/PLIST.NetBSD-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.netbsd-alpha,v 1.1 2001/10/31 23:31:15 zuntum Exp $
+@comment $NetBSD: PLIST.NetBSD-i386,v 1.1 2005/02/21 21:26:15 veego Exp $
 Acrobat3/Reader/${PLATFORM}/lib/libagm.so
 Acrobat3/Reader/${PLATFORM}/lib/libagm.so.2.0
 Acrobat3/Reader/${PLATFORM}/lib/libpfs.so
diff --git a/print/acroread3/PLIST.netbsd-sparc b/print/acroread3/PLIST.NetBSD-sparc
index ab372ddb928..c98488f95f1 100644
--- a/print/acroread3/PLIST.netbsd-sparc
+++ b/print/acroread3/PLIST.NetBSD-sparc
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.netbsd-sparc,v 1.1 2001/10/31 23:31:15 zuntum Exp $
+@comment $NetBSD: PLIST.NetBSD-sparc,v 1.1 2005/02/21 21:26:15 veego Exp $
 Acrobat3/Reader/desktop/olwm/acroread.cetable
 Acrobat3/Reader/desktop/olwm/acroread.deskinstall
 Acrobat3/Reader/desktop/olwm/acroread.prog.icon
diff --git a/print/acroread3/PLIST.sunos-sparc b/print/acroread3/PLIST.SunOS-sparc
index f9f31346740..2d5449135d1 100644
--- a/print/acroread3/PLIST.sunos-sparc
+++ b/print/acroread3/PLIST.SunOS-sparc
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.sunos-sparc,v 1.1 2001/10/31 23:31:15 zuntum Exp $
+@comment $NetBSD: PLIST.SunOS-sparc,v 1.1 2005/02/21 21:26:15 veego Exp $
 Acrobat3/Reader/desktop/olwm/acroread.cetable
 Acrobat3/Reader/desktop/olwm/acroread.deskinstall
 Acrobat3/Reader/desktop/olwm/acroread.prog.icon
diff --git a/print/acroread3/PLIST.pre b/print/acroread3/PLIST.common
index 330df763f2a..daa1a35b184 100644
--- a/print/acroread3/PLIST.pre
+++ b/print/acroread3/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/10/31 23:31:15 zuntum Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2005/02/21 21:26:15 veego Exp $
 Acrobat3/Browsers/netscape
 Acrobat3/Browsers/${PLATFORM}/nppdf.so
 Acrobat3/Fonts/AcroRead.upr
diff --git a/print/acroread3/PLIST.post b/print/acroread3/PLIST.common_end
index 4359fd696fc..5ccba8fd517 100644
--- a/print/acroread3/PLIST.post
+++ b/print/acroread3/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.post,v 1.2 2002/02/15 10:12:56 skrll Exp $
+@comment $NetBSD: PLIST.common_end,v 1.1 2005/02/21 21:26:15 veego Exp $
 @exec ln -sf %D/Acrobat3/Reader/Fonts %D/Acrobat3/Reader/${PLATFORM}/fonts
 @unexec ${RM} -f %D/Acrobat3/Reader/${PLATFORM}/fonts
 @exec ln -sf %D/Acrobat3/Reader/res %D/Acrobat3/Reader/${PLATFORM}/res