diff options
author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2013-11-16 03:33:37 +0000 |
---|---|---|
committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2013-11-16 03:33:37 +0000 |
commit | 6021f45fc7f7b0928901e91d2b788d4a2497c349 (patch) | |
tree | e4a8c535c52ba9629392f5f9dc1d7e7466111234 /sysutils | |
parent | - Add stage support (diff) |
Support STAGEDIR.
Notes
Notes:
svn path=/head/; revision=333977
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/pdixtract/Makefile | 3 | ||||
-rw-r--r-- | sysutils/personality/Makefile | 14 | ||||
-rw-r--r-- | sysutils/personality/files/pkg-message.in | 8 | ||||
-rw-r--r-- | sysutils/personality/pkg-message | 8 | ||||
-rw-r--r-- | sysutils/prips/Makefile | 19 | ||||
-rw-r--r-- | sysutils/procmap/Makefile | 5 | ||||
-rw-r--r-- | sysutils/progsreiserfs/Makefile | 4 | ||||
-rw-r--r-- | sysutils/progsreiserfs/pkg-plist | 5 | ||||
-rw-r--r-- | sysutils/pslist/Makefile | 7 | ||||
-rw-r--r-- | sysutils/pslist/pkg-plist | 6 |
10 files changed, 30 insertions, 49 deletions
diff --git a/sysutils/pdixtract/Makefile b/sysutils/pdixtract/Makefile index 7baad8c21803..1f46008865a0 100644 --- a/sysutils/pdixtract/Makefile +++ b/sysutils/pdixtract/Makefile @@ -19,11 +19,10 @@ USE_ZIP= yes PLIST_FILES= bin/pdixtract -NO_STAGE= yes do-build: cd ${WRKDIR}; ${CC} ${CFLAGS} pdixtract.c -o pdixtract do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/pdixtract ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKDIR}/pdixtract ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/sysutils/personality/Makefile b/sysutils/personality/Makefile index fe55b9f60370..8550a8ff6a16 100644 --- a/sysutils/personality/Makefile +++ b/sysutils/personality/Makefile @@ -11,21 +11,17 @@ COMMENT= System configuration management utility to alter system personality WRKSRC= ${WRKDIR}/src NO_BUILD= YES +SUB_FILES= pkg-message + +PLIST_FILES= man/man8/${PORTNAME}.8.gz sbin/personality -NO_STAGE= yes do-extract: @ ${RM} -rf ${WRKDIR} @ ${MKDIR} ${WRKDIR} @ ${CP} -RP ${.CURDIR}/src ${WRKDIR} -MAN8= personality.8 -PLIST_FILES= sbin/personality - do-install: - @ ${INSTALL_SCRIPT} ${WRKSRC}/personality ${PREFIX}/sbin - @ ${INSTALL_DATA} ${WRKSRC}/personality.8 ${PREFIX}/man/man8 - -post-install: - @ ${CAT} ${.CURDIR}/pkg-message + @ ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin + @ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8 .include <bsd.port.mk> diff --git a/sysutils/personality/files/pkg-message.in b/sysutils/personality/files/pkg-message.in new file mode 100644 index 000000000000..c0112ac702e1 --- /dev/null +++ b/sysutils/personality/files/pkg-message.in @@ -0,0 +1,8 @@ +To change the personality of your system at system boot +you have to add the following line into the /etc/rc script. + +[ -x %%PREFIX%%/sbin/personality ] && %%PREFIX%%/sbin/personality menu 60 + +Make sure that you add this after mounting of the ufs filesystems. +If you prefer you can use other values than 60 seconds. +After 60 seconds the system boots with the last configuration. diff --git a/sysutils/personality/pkg-message b/sysutils/personality/pkg-message index 68041d109a3c..e69de29bb2d1 100644 --- a/sysutils/personality/pkg-message +++ b/sysutils/personality/pkg-message @@ -1,8 +0,0 @@ -To change the personality of your system at system boot -you have to add the following line into the /etc/rc script. - -[ -x /usr/local/sbin/personality ] && /usr/local/sbin/personality menu 60 - -Make sure that you add this after mounting of the ufs filesystems. -If you prefer you can use other values than 60 seconds. -After 60 seconds the system boots with the last configuration. diff --git a/sysutils/prips/Makefile b/sysutils/prips/Makefile index 0b0d9a6dbf7d..5482de5d9577 100644 --- a/sysutils/prips/Makefile +++ b/sysutils/prips/Makefile @@ -11,25 +11,14 @@ COMMENT= Prints IP subnet ranges by list or CIDR LICENSE= GPLv2 -PORTDOCS= README -PLIST_FILES= bin/prips - -MAN1= prips.1 -MANCOMPRESSED= yes - MAKE_ENV+= CFLAGS_WARN="-Wall -W" OPTIONS_DEFINE= DOCS -NO_STAGE= yes -.include <bsd.port.options.mk> - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/prips ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/prips.1.gz ${PREFIX}/man/man1/ -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/prips ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/prips.1.gz ${STAGEDIR}${PREFIX}/man/man1/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/sysutils/procmap/Makefile b/sysutils/procmap/Makefile index c174e980e7ff..5aee30f40e93 100644 --- a/sysutils/procmap/Makefile +++ b/sysutils/procmap/Makefile @@ -14,13 +14,10 @@ MAKEFILE= /usr/share/mk/bsd.prog.mk MAKE_ENV+= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man \ PROG=procmap MAN8=procmap.8 -PLIST_FILES= bin/procmap -MAN8= procmap.8 -MANCOMPRESSED= yes +PLIST_FILES= bin/procmap man/man8/${PORTNAME}.8.gz procmap_files := procmap.c procmap.8 -NO_STAGE= yes post-extract: cd ${FILESDIR} ; \ ${CP} -p ${procmap_files} ${WRKSRC} diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile index 8b9e66074209..d7943b94577a 100644 --- a/sysutils/progsreiserfs/Makefile +++ b/sysutils/progsreiserfs/Makefile @@ -18,7 +18,6 @@ CFLAGS+= -Dgetopt_long_only=getopt_long EXTRA_PATCHES= ${FILESDIR}/extrapatch-progsreiserfs::libmisc::Makefile.in -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} @@ -29,9 +28,6 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--disable-nls .endif -MAN8= cpfs.reiserfs.8 mkfs.reiserfs.8 reiserfs.8 \ - resizefs.reiserfs.8 tunefs.reiserfs.8 - post-patch: @${REINPLACE_CMD} -e 's|^LIBTOOL=.*|LIBTOOL=${LIBTOOL}|g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/sysutils/progsreiserfs/pkg-plist b/sysutils/progsreiserfs/pkg-plist index a0b7fe6ea132..0054cb3902d8 100644 --- a/sysutils/progsreiserfs/pkg-plist +++ b/sysutils/progsreiserfs/pkg-plist @@ -29,6 +29,11 @@ lib/libreiserfs-0.3.so.0 lib/libreiserfs.a lib/libreiserfs.la lib/libreiserfs.so +man/man8/cpfs.reiserfs.8.gz +man/man8/mkfs.reiserfs.8.gz +man/man8/reiserfs.8.gz +man/man8/resizefs.reiserfs.8.gz +man/man8/tunefs.reiserfs.8.gz sbin/cpfs.reiserfs sbin/fsck.reiserfs sbin/mkfs.reiserfs diff --git a/sysutils/pslist/Makefile b/sysutils/pslist/Makefile index d064070a4b4f..5b3aadf709b9 100644 --- a/sysutils/pslist/Makefile +++ b/sysutils/pslist/Makefile @@ -12,11 +12,4 @@ COMMENT= A utility to view or send signals to processes with all their children USES= perl5 USE_PERL5= run -MAN1= pslist.1 -MLINKS= pslist.1 rkill.1 pslist.1 rrenice.1 -PLIST_FILES= bin/pslist \ - bin/rkill \ - bin/rrenice - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/sysutils/pslist/pkg-plist b/sysutils/pslist/pkg-plist new file mode 100644 index 000000000000..c6b97b1cc487 --- /dev/null +++ b/sysutils/pslist/pkg-plist @@ -0,0 +1,6 @@ +bin/pslist +bin/rkill +bin/rrenice +man/man1/pslist.1.gz +man/man1/rkill.1.gz +man/man1/rrenice.1.gz |