diff options
author | veego <veego@pkgsrc.org> | 2005-02-21 21:18:28 +0000 |
---|---|---|
committer | veego <veego@pkgsrc.org> | 2005-02-21 21:18:28 +0000 |
commit | 990db5f287057f43ecd95d2650a454e69c31a2e7 (patch) | |
tree | 736a193ec1f6720f0e293894c0f18c490a000d0c /emulators/netbsd32_compat16 | |
parent | 1741aefc24ff07beca40cde199df7e301cc6ed33 (diff) | |
download | pkgsrc-990db5f287057f43ecd95d2650a454e69c31a2e7.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.
PLIST.* files renamed so we don't need the special handling for MACHINE32_ARCH.
Merge the PLIST.* files as much as possible into PLIST, so they only
contain the difference between the two archs which are only supported by
this package.
Diffstat (limited to 'emulators/netbsd32_compat16')
-rw-r--r-- | emulators/netbsd32_compat16/Makefile | 7 | ||||
-rw-r--r-- | emulators/netbsd32_compat16/PLIST | 21 | ||||
-rw-r--r-- | emulators/netbsd32_compat16/PLIST.i386 | 23 | ||||
-rw-r--r-- | emulators/netbsd32_compat16/PLIST.sparc | 27 | ||||
-rw-r--r-- | emulators/netbsd32_compat16/PLIST.sparc64 | 8 | ||||
-rw-r--r-- | emulators/netbsd32_compat16/PLIST.x86_64 | 4 |
6 files changed, 33 insertions, 57 deletions
diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile index fd74ae94add..66301d4b8f8 100644 --- a/emulators/netbsd32_compat16/Makefile +++ b/emulators/netbsd32_compat16/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/01/11 05:12:56 hamajima Exp $ +# $NetBSD: Makefile,v 1.9 2005/02/21 21:18:28 veego Exp $ # .if ${MACHINE_ARCH} == "sparc64" @@ -48,11 +48,6 @@ COMPAT_LIBDIR= ${PREFIX}/${EMULSUBDIR}/usr/lib COMPAT_LIBEXECDIR= ${PREFIX}/${EMULSUBDIR}/usr/libexec COMPAT_XLIBDIR= ${PREFIX}/${EMULSUBDIR}/usr/X11R6/lib -PLIST_SRC+= ${PKGDIR}/PLIST -.if exists(${PKGDIR}/PLIST.${MACHINE32_ARCH}) -PLIST_SRC+= ${PKGDIR}/PLIST.${MACHINE32_ARCH} -.endif - PLIST_SUBST+= COMPAT_EMULSUBDIR=${EMULSUBDIR} # XXX using pax to copy symlinks properly. diff --git a/emulators/netbsd32_compat16/PLIST b/emulators/netbsd32_compat16/PLIST index 2599ff2f90b..806a3d81870 100644 --- a/emulators/netbsd32_compat16/PLIST +++ b/emulators/netbsd32_compat16/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2005/01/11 05:12:56 hamajima Exp $ +@comment $NetBSD: PLIST,v 1.3 2005/02/21 21:18:28 veego Exp $ ${COMPAT_EMULSUBDIR}/usr/lib/libamu.so.2 ${COMPAT_EMULSUBDIR}/usr/lib/libamu.so.2.1 ${COMPAT_EMULSUBDIR}/usr/lib/libasn1.so.6 @@ -107,3 +107,22 @@ ${COMPAT_EMULSUBDIR}/usr/lib/libz.so.0 ${COMPAT_EMULSUBDIR}/usr/lib/libz.so.0.2 ${COMPAT_EMULSUBDIR}/usr/libexec/ld.elf_so ${COMPAT_EMULSUBDIR}/usr/libexec/ld.so +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6.0 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6.1 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6.0 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6.2 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6.0 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6.1 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6.0 diff --git a/emulators/netbsd32_compat16/PLIST.i386 b/emulators/netbsd32_compat16/PLIST.i386 deleted file mode 100644 index cb3d88781a8..00000000000 --- a/emulators/netbsd32_compat16/PLIST.i386 +++ /dev/null @@ -1,23 +0,0 @@ -@comment $NetBSD: PLIST.i386,v 1.1 2005/01/11 05:12:56 hamajima Exp $ -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6.0 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.2 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6.1 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.4 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6.0 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.2 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6.2 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6.0 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6.1 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6.0 diff --git a/emulators/netbsd32_compat16/PLIST.sparc b/emulators/netbsd32_compat16/PLIST.sparc deleted file mode 100644 index 14660934fb7..00000000000 --- a/emulators/netbsd32_compat16/PLIST.sparc +++ /dev/null @@ -1,27 +0,0 @@ -@comment $NetBSD: PLIST.sparc,v 1.1 2005/01/11 05:12:56 hamajima Exp $ -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6.0 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6.0 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.1 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6.0 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6.1 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.3 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6.0 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.0 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6.2 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6.0 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6.1 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6 -${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6.0 diff --git a/emulators/netbsd32_compat16/PLIST.sparc64 b/emulators/netbsd32_compat16/PLIST.sparc64 new file mode 100644 index 00000000000..06f9c71c957 --- /dev/null +++ b/emulators/netbsd32_compat16/PLIST.sparc64 @@ -0,0 +1,8 @@ +@comment $NetBSD: PLIST.sparc64,v 1.1 2005/02/21 21:18:28 veego Exp $ +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6.0 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.1 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6.0 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.3 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.0 diff --git a/emulators/netbsd32_compat16/PLIST.x86_64 b/emulators/netbsd32_compat16/PLIST.x86_64 new file mode 100644 index 00000000000..cf2e1c1f795 --- /dev/null +++ b/emulators/netbsd32_compat16/PLIST.x86_64 @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST.x86_64,v 1.1 2005/02/21 21:18:28 veego Exp $ +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.2 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.4 +${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.2 |