diff options
-rw-r--r-- | devel/binutils/Makefile | 8 | ||||
-rw-r--r-- | devel/binutils/PLIST | 2 | ||||
-rw-r--r-- | devel/binutils/PLIST.SunOS | 49 | ||||
-rw-r--r-- | devel/binutils/PLIST.common | 44 | ||||
-rw-r--r-- | devel/binutils/PLIST.common_end | 5 | ||||
-rw-r--r-- | lang/python22-pth/Makefile | 4 | ||||
-rw-r--r-- | lang/python22-pth/PLIST.Linux (renamed from lang/python22-pth/PLIST.linux) | 2 | ||||
-rw-r--r-- | lang/python22-pth/PLIST.NetBSD | 2 | ||||
-rw-r--r-- | lang/python22-pth/PLIST.netbsd | 2 | ||||
-rw-r--r-- | misc/kdeutils/Makefile | 3 | ||||
-rw-r--r-- | misc/screen/Makefile | 8 |
11 files changed, 62 insertions, 67 deletions
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index 90da0a5fc16..86daff09397 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/09/29 07:32:55 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/12/25 16:53:51 grant Exp $ # DISTNAME= binutils-2.11.2 @@ -19,14 +19,14 @@ GNU_CONFIGURE= YES .if ${OPSYS} == "NetBSD" PATCHFILES= binutils-NetBSD-diff-20020418.patch.bz2 PATCH_SITES= ${MASTER_SITE_LOCAL} -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC ${PKGDIR}/PLIST +PLIST_SRC= ${PKGDIR}/PLIST.common +PLIST_SRC+= ${WRKDIR}/PLIST_DYNAMIC +PLIST_SRC+= ${WRKDIR}/PLIST.common_end post-install: ${FIND} ${PREFIX}/${MACHINE_GNU_PLATFORM}/lib/ldscripts -type f -print | \ ${SORT} -r | ${SED} 's;${PREFIX}/;;g' > ${WRKDIR}/PLIST_DYNAMIC -.else -PLIST_SRC= ${PKGDIR}/PLIST.${OPSYS} .endif .include "../../mk/bsd.pkg.mk" diff --git a/devel/binutils/PLIST b/devel/binutils/PLIST index c1355b8b440..8db5800cfa3 100644 --- a/devel/binutils/PLIST +++ b/devel/binutils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:22 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/12/25 16:53:51 grant Exp $ ${MACHINE_GNU_PLATFORM}/bin/ar ${MACHINE_GNU_PLATFORM}/bin/as ${MACHINE_GNU_PLATFORM}/bin/ld diff --git a/devel/binutils/PLIST.SunOS b/devel/binutils/PLIST.SunOS index 9e36f7cda27..8b57f8eec9c 100644 --- a/devel/binutils/PLIST.SunOS +++ b/devel/binutils/PLIST.SunOS @@ -1,10 +1,4 @@ -@comment $NetBSD: PLIST.SunOS,v 1.2 2002/08/25 19:22:22 jlam Exp $ -${MACHINE_GNU_PLATFORM}/bin/ar -${MACHINE_GNU_PLATFORM}/bin/as -${MACHINE_GNU_PLATFORM}/bin/ld -${MACHINE_GNU_PLATFORM}/bin/nm -${MACHINE_GNU_PLATFORM}/bin/ranlib -${MACHINE_GNU_PLATFORM}/bin/strip +@comment $NetBSD: PLIST.SunOS,v 1.3 2002/12/25 16:53:51 grant Exp $ ${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf32_${MACHINE_GNU_ARCH}.x ${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf32_${MACHINE_GNU_ARCH}.xbn ${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf32_${MACHINE_GNU_ARCH}.xn @@ -17,44 +11,3 @@ ${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf64_${MACHINE_GNU_ARCH}.xn ${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf64_${MACHINE_GNU_ARCH}.xr ${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf64_${MACHINE_GNU_ARCH}.xs ${MACHINE_GNU_PLATFORM}/lib/ldscripts/elf64_${MACHINE_GNU_ARCH}.xu -bin/addr2line -bin/ar -bin/as -bin/c++filt -bin/gasp -bin/gprof -bin/ld -bin/nm -bin/objcopy -bin/objdump -bin/ranlib -bin/readelf -bin/size -bin/strings -bin/strip -include/ansidecl.h -include/bfd.h -include/bfdlink.h -lib/libbfd.a -lib/libbfd.la -lib/libiberty.a -lib/libopcodes.a -lib/libopcodes.la -man/man1/addr2line.1 -man/man1/ar.1 -man/man1/as.1 -man/man1/c++filt.1 -man/man1/gprof.1 -man/man1/ld.1 -man/man1/nlmconv.1 -man/man1/nm.1 -man/man1/objcopy.1 -man/man1/objdump.1 -man/man1/ranlib.1 -man/man1/size.1 -man/man1/strings.1 -man/man1/strip.1 -@dirrm ${MACHINE_GNU_PLATFORM}/lib/ldscripts -@dirrm ${MACHINE_GNU_PLATFORM}/lib -@dirrm ${MACHINE_GNU_PLATFORM}/bin -@dirrm ${MACHINE_GNU_PLATFORM} diff --git a/devel/binutils/PLIST.common b/devel/binutils/PLIST.common new file mode 100644 index 00000000000..0b927bbd3da --- /dev/null +++ b/devel/binutils/PLIST.common @@ -0,0 +1,44 @@ +@comment $NetBSD: PLIST.common,v 1.1 2002/12/25 16:53:51 grant Exp $ +${MACHINE_GNU_PLATFORM}/bin/ar +${MACHINE_GNU_PLATFORM}/bin/as +${MACHINE_GNU_PLATFORM}/bin/ld +${MACHINE_GNU_PLATFORM}/bin/nm +${MACHINE_GNU_PLATFORM}/bin/ranlib +${MACHINE_GNU_PLATFORM}/bin/strip +bin/addr2line +bin/ar +bin/as +bin/c++filt +bin/gasp +bin/gprof +bin/ld +bin/nm +bin/objcopy +bin/objdump +bin/ranlib +bin/readelf +bin/size +bin/strings +bin/strip +include/ansidecl.h +include/bfd.h +include/bfdlink.h +lib/libbfd.a +lib/libbfd.la +lib/libiberty.a +lib/libopcodes.a +lib/libopcodes.la +man/man1/addr2line.1 +man/man1/ar.1 +man/man1/as.1 +man/man1/c++filt.1 +man/man1/gprof.1 +man/man1/ld.1 +man/man1/nlmconv.1 +man/man1/nm.1 +man/man1/objcopy.1 +man/man1/objdump.1 +man/man1/ranlib.1 +man/man1/size.1 +man/man1/strings.1 +man/man1/strip.1 diff --git a/devel/binutils/PLIST.common_end b/devel/binutils/PLIST.common_end new file mode 100644 index 00000000000..64da4bb79b8 --- /dev/null +++ b/devel/binutils/PLIST.common_end @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST.common_end,v 1.1 2002/12/25 16:53:51 grant Exp $ +@dirrm ${MACHINE_GNU_PLATFORM}/lib/ldscripts +@dirrm ${MACHINE_GNU_PLATFORM}/lib +@dirrm ${MACHINE_GNU_PLATFORM}/bin +@dirrm ${MACHINE_GNU_PLATFORM} diff --git a/lang/python22-pth/Makefile b/lang/python22-pth/Makefile index 95d691d919d..4d565e02eed 100644 --- a/lang/python22-pth/Makefile +++ b/lang/python22-pth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/12/25 16:57:43 grant Exp $ # DISTNAME= Python-2.2.2 @@ -17,8 +17,6 @@ GNU_CONFIGURE= YES .include "../../mk/bsd.prefs.mk" PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//} -PLIST_SRC= ${PKGDIR}/PLIST.common ${PKGDIR}/PLIST.${LOWER_OPSYS} \ - ${PKGDIR}/PLIST.common_end .if ${OPSYS} == "NetBSD" CONFIGURE_ARGS+= --with-pth diff --git a/lang/python22-pth/PLIST.linux b/lang/python22-pth/PLIST.Linux index 343b40e6540..24ad04bf71a 100644 --- a/lang/python22-pth/PLIST.linux +++ b/lang/python22-pth/PLIST.Linux @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $ +@comment $NetBSD: PLIST.Linux,v 1.1 2002/12/25 16:57:43 grant Exp $ lib/python2p2/plat-linux2/CDROM.py lib/python2p2/plat-linux2/CDROM.pyc lib/python2p2/plat-linux2/CDROM.pyo diff --git a/lang/python22-pth/PLIST.NetBSD b/lang/python22-pth/PLIST.NetBSD new file mode 100644 index 00000000000..7a42aacd9fa --- /dev/null +++ b/lang/python22-pth/PLIST.NetBSD @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST.NetBSD,v 1.1 2002/12/25 16:57:44 grant Exp $ +lib/python2p2/lib-dynload/bsddb.so diff --git a/lang/python22-pth/PLIST.netbsd b/lang/python22-pth/PLIST.netbsd deleted file mode 100644 index 4dc9e7fa825..00000000000 --- a/lang/python22-pth/PLIST.netbsd +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.netbsd,v 1.1.1.1 2002/10/25 10:48:48 drochner Exp $ -lib/python2p2/lib-dynload/bsddb.so diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile index 83bc42952bf..5fb9f8fee2b 100644 --- a/misc/kdeutils/Makefile +++ b/misc/kdeutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2002/09/01 04:26:11 hubertf Exp $ +# $NetBSD: Makefile,v 1.47 2002/12/25 16:59:03 grant Exp $ # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp # @@ -29,7 +29,6 @@ CONFIGURE_ENV= KDEDIR=${KDEBASEDIR} \ .if ${OPSYS} == "SunOS" CONFIGURE_ENV+= DO_NOT_COMPILE=kab -PLIST_SRC= ${PKGDIR}/PLIST.${OPSYS} .endif .include "../../mk/bsd.pkg.mk" diff --git a/misc/screen/Makefile b/misc/screen/Makefile index ccd2c9ba845..2bb147d7f38 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2002/12/23 16:25:30 cjep Exp $ +# $NetBSD: Makefile,v 1.40 2002/12/25 16:59:58 grant Exp $ DISTNAME= screen-3.9.13 CATEGORIES= misc @@ -20,10 +20,6 @@ CONFIGURE_ARGS+= --enable-telnet .include "../../mk/bsd.prefs.mk" -.if exists(${PKGDIR}/PLIST.${OPSYS}) -PLIST_SRC= ${PKGDIR}/PLIST.${OPSYS} -.endif - post-patch: @for file in etc/etcscreenrc doc/screen.1; do \ ${MV} ${WRKSRC}/$$file ${WRKSRC}/$$file.orig; \ @@ -35,7 +31,7 @@ post-install: @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/screen ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \ ${PREFIX}/share/examples/screen/screenrc -.if (${OPSYS} == SunOS) +.if ${OPSYS} == "SunOS" cd ${WRKSRC}/terminfo && \ ${SETENV} TERMINFO=${PREFIX}/share/lib/terminfo \ /usr/5bin/tic screeninfo.src |