diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/bbsmount/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/disktool/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/disktool/files/patch-disktool.c (renamed from sysutils/disktool/files/extrapatch-disktool.c) | 0 | ||||
| -rw-r--r-- | sysutils/heirloom/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/pkill/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/slmon/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/wmbsdbatt/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/wmtop/Makefile | 6 |
8 files changed, 9 insertions, 48 deletions
diff --git a/sysutils/bbsmount/Makefile b/sysutils/bbsmount/Makefile index ea98d24bbc2a..2f8d94d0b240 100644 --- a/sysutils/bbsmount/Makefile +++ b/sysutils/bbsmount/Makefile @@ -21,13 +21,7 @@ PORTDOCS= README BUGS NEWS AUTHORS ChangeLog MAN1= bbsmount.1 -.include <bsd.port.pre.mk> - post-patch: -.if ${OSVERSION} < 500000 - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} -.endif @${REINPLACE_CMD} -e 's|-O[012]||g' ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|SUBDIRS = data|SUBDIRS =|' ${WRKSRC}/Makefile.in @@ -46,4 +40,4 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/data/bbsmount.bb ${PREFIX}/share/bbtools/bbsmount.bb-sample @${INSTALL_DATA} ${WRKSRC}/data/bbsmount.bb.ex ${EXAMPLESDIR}/bbsmount.bb.ex -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/disktool/Makefile b/sysutils/disktool/Makefile index f018ebcb2e20..57651f15c119 100644 --- a/sysutils/disktool/Makefile +++ b/sysutils/disktool/Makefile @@ -26,12 +26,6 @@ ALL_TARGET= disktool MAN1= disktool.1 PLIST_FILES= bin/disktool -.include <bsd.port.pre.mk> - -.if ${OSVERSION} > 500000 -EXTRA_PATCHES= ${FILESDIR}/extrapatch-disktool.c -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile @@ -40,4 +34,4 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/disktool.man \ ${PREFIX}/man/man1/disktool.1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/disktool/files/extrapatch-disktool.c b/sysutils/disktool/files/patch-disktool.c index c769cc803d7e..c769cc803d7e 100644 --- a/sysutils/disktool/files/extrapatch-disktool.c +++ b/sysutils/disktool/files/patch-disktool.c diff --git a/sysutils/heirloom/Makefile b/sysutils/heirloom/Makefile index af004a7be882..c7ae7bb927cb 100644 --- a/sysutils/heirloom/Makefile +++ b/sysutils/heirloom/Makefile @@ -77,12 +77,6 @@ DOC_FILES= CHANGES LICENSE/COPYING LICENSE/LICENSE LICENSE/LUCENT \ # more/NOTES nawk/NOTES oawk/EXPLAIN oawk/NOTES \ # oawk/README ps/NOTES shl/NOTES tar/NOTES -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= does not build on FreeBSD 4.x which is missing wide-characters -.endif - pre-configure: @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/build/mk.config ${WRKSRC}/su/su.dfl.in @@ -102,4 +96,4 @@ install-doc: #. endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/pkill/Makefile b/sysutils/pkill/Makefile index 54df0ee26d11..3b38be191902 100644 --- a/sysutils/pkill/Makefile +++ b/sysutils/pkill/Makefile @@ -10,10 +10,13 @@ PORTVERSION= 0.2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= lioux +DISTNAME= ${PORTNAME}-current-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= NetBSD's pgrep and pkill: find or signal processes matching criteria +WRKSRC= ${WRKDIR}/${PORTNAME}-current + MAKE_ENV= BINDIR=${PREFIX}/bin \ MANDIR=${PREFIX}/man/man @@ -26,12 +29,4 @@ MAN1= pgrep.1 pkill.1 IGNORE= "is included in the base system" .endif -.if ${OSVERSION} >= 500000 -DISTNAME= ${PORTNAME}-current-${PORTVERSION} -WRKSRC= ${WRKDIR}/${PORTNAME}-current -.else -DISTNAME= ${PORTNAME}-stable-${PORTVERSION} -WRKSRC= ${WRKDIR}/${PORTNAME}-stable -.endif - .include <bsd.port.post.mk> diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile index 6020e9e9fff2..6408afc4345f 100644 --- a/sysutils/slmon/Makefile +++ b/sysutils/slmon/Makefile @@ -31,10 +31,4 @@ PLIST_FILES= bin/slmon CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib -lncurses -lm -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 400010 -LIB_DEPENDS+= ncurses:${PORTSDIR}/devel/ncurses -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/wmbsdbatt/Makefile b/sysutils/wmbsdbatt/Makefile index 188673166177..638bc54c6303 100644 --- a/sysutils/wmbsdbatt/Makefile +++ b/sysutils/wmbsdbatt/Makefile @@ -20,10 +20,4 @@ PLIST_FILES= bin/wmbsdbatt do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmbsdbatt ${PREFIX}/bin -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= does not compile on 4.x -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/wmtop/Makefile b/sysutils/wmtop/Makefile index 71a60c732ecd..d33b198a5786 100644 --- a/sysutils/wmtop/Makefile +++ b/sysutils/wmtop/Makefile @@ -26,13 +26,9 @@ PLIST_FILES= bin/wmtop PORTDOCS= BUGS CHANGES COPYING README TODO .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500000 post-patch: ${REINPLACE_CMD} -e 's/^\(LIBS.*\)/\1 -lkvm/' ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's/^\(FLAGS.*\)/\1 -DNO_PROCFS/' ${WRKSRC}/Makefile -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmtop ${PREFIX}/bin/ @@ -46,4 +42,4 @@ do-install: .endfor .endif # !NOPORTDOCS -.include <bsd.port.post.mk> +.include <bsd.port.mk> |