diff options
author | veego <veego> | 2005-02-21 20:57:20 +0000 |
---|---|---|
committer | veego <veego> | 2005-02-21 20:57:20 +0000 |
commit | 167a4252957215567a279e836b7f536bff7c92f8 (patch) | |
tree | 0d94860add565c3792251a17ba8f019b0887fca8 /emulators | |
parent | 342063015d9ae2c0f99b82aafc837d637be3f3c9 (diff) | |
download | pkgsrc-167a4252957215567a279e836b7f536bff7c92f8.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.
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/compat13/Makefile | 4 | ||||
-rw-r--r-- | emulators/compat14-crypto/Makefile | 7 | ||||
-rw-r--r-- | emulators/compat14/Makefile | 7 | ||||
-rw-r--r-- | emulators/compat16/Makefile | 6 | ||||
-rw-r--r-- | emulators/twin/Makefile | 9 |
5 files changed, 5 insertions, 28 deletions
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile index dc01152623c..5c9b2909a7d 100644 --- a/emulators/compat13/Makefile +++ b/emulators/compat13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/08/30 22:51:15 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/02/21 20:57:20 veego Exp $ # DISTNAME= compat13-${MACHINE_ARCH}${PKGMINOR} @@ -40,8 +40,6 @@ COMPAT_LIBDIR= lib .endif .if ${MACHINE_ARCH} == "alpha" -PLIST_SRC+= ${PKGDIR}/PLIST -PLIST_SRC+= ${PKGDIR}/PLIST.alpha PKGMINOR= nb1 .else PKGMINOR= diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile index b21a04068c1..e0cea61d1cb 100644 --- a/emulators/compat14-crypto/Makefile +++ b/emulators/compat14-crypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/12/15 06:21:33 grant Exp $ +# $NetBSD: Makefile,v 1.7 2005/02/21 20:57:20 veego Exp $ # DISTNAME= compat14-crypto-${MACHINE_ARCH}-${VERSION} @@ -46,11 +46,6 @@ COMPAT_LIBDIR= lib COMPAT_XLIBDIR= X11R6/lib .endif -PLIST_SRC+= ${PKGDIR}/PLIST -.if exists(${PKGDIR}/PLIST.${MACHINE_ARCH}) -PLIST_SRC+= ${PKGDIR}/PLIST.${MACHINE_ARCH} -.endif - PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR} # note that the INSTALL_DATA for the lib*.so symlinks will copy the file, not the symlink. diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile index c7c8c7fc696..5c0e60888af 100644 --- a/emulators/compat14/Makefile +++ b/emulators/compat14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/12/15 06:21:32 grant Exp $ +# $NetBSD: Makefile,v 1.10 2005/02/21 20:57:20 veego Exp $ # DISTNAME= compat14-${MACHINE_ARCH}-${VERSION} @@ -44,11 +44,6 @@ COMPAT_LIBDIR= lib COMPAT_XLIBDIR= X11R6/lib .endif -PLIST_SRC+= ${PKGDIR}/PLIST -.if exists(${PKGDIR}/PLIST.${MACHINE_ARCH}) -PLIST_SRC+= ${PKGDIR}/PLIST.${MACHINE_ARCH} -.endif - PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR} # note that the INSTALL_DATA for the lib*.so symlinks will copy the file, not the symlink. diff --git a/emulators/compat16/Makefile b/emulators/compat16/Makefile index 5d38de4720b..7b5ea0e1795 100644 --- a/emulators/compat16/Makefile +++ b/emulators/compat16/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/12/14 04:17:18 grant Exp $ +# $NetBSD: Makefile,v 1.2 2005/02/21 20:57:20 veego Exp $ # DISTNAME= compat16-${MACHINE_ARCH}-${VERSION} @@ -24,10 +24,6 @@ SHLIB_HANDLING= NO EMULSUBDIR= emul/netbsd16 -.if exists(${PKGDIR}/PLIST.${MACHINE_ARCH}) -PLIST_SRC= ${PKGDIR}/PLIST.${MACHINE_ARCH} -.endif - PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR} do-install: diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile index ebaa9dcd778..374b50719c1 100644 --- a/emulators/twin/Makefile +++ b/emulators/twin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/12/03 15:14:56 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2005/02/21 20:57:20 veego Exp $ # DISTNAME= twin-src-3.1.14 @@ -18,7 +18,6 @@ USE_X11= yes BUILD_TARGET= depend world AUTOCONF_REQD= 2.13 CONFIGURE_ARGS= --enable-debugger -PLIST_SRC= ${WRKDIR}/PLIST pre-configure: cd ${WRKSRC} && ${AUTORECONF} --force @@ -26,12 +25,6 @@ pre-configure: pre-build: ${CP} ${WRKSRC}/windows/Execfreebsd.c ${WRKSRC}/windows/Execnetbsd.c -pre-install: - @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} -.if exists(${PKGDIR}/PLIST.${MACHINE_ARCH}) - @${CAT} ${PKGDIR}/PLIST.${MACHINE_ARCH} >> ${PLIST_SRC} -.endif - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/twin ${INSTALL_DATA} ${WRKSRC}/documentation/* ${PREFIX}/share/doc/twin/ |