Date: Sat, 9 Nov 2013 05:55:32 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333275 - in head/sysutils: enteruser etcmerge extipl Message-ID: <201311090555.rA95tWRl032152@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Sat Nov 9 05:55:32 2013 New Revision: 333275 URL: http://svnweb.freebsd.org/changeset/ports/333275 Log: Support STAGEDIR. Added: head/sysutils/extipl/pkg-plist (contents, props changed) Modified: head/sysutils/enteruser/Makefile head/sysutils/enteruser/pkg-plist head/sysutils/etcmerge/Makefile head/sysutils/extipl/Makefile Modified: head/sysutils/enteruser/Makefile ============================================================================== --- head/sysutils/enteruser/Makefile Sat Nov 9 05:30:09 2013 (r333274) +++ head/sysutils/enteruser/Makefile Sat Nov 9 05:55:32 2013 (r333275) @@ -18,13 +18,12 @@ NO_BUILD= yes SHEBANG_FILES= enteruser -NO_STAGE= yes do-extract: @${MKDIR} ${WRKSRC} @${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/enteruser ${PREFIX}/sbin - ${LN} -f ${PREFIX}/sbin/enteruser ${PREFIX}/sbin/queueuser + ${INSTALL_SCRIPT} ${WRKSRC}/enteruser ${STAGEDIR}${PREFIX}/sbin + @cd ${STAGEDIR}${PREFIX}/sbin; ${LN} -sf enteruser queueuser .include <bsd.port.mk> Modified: head/sysutils/enteruser/pkg-plist ============================================================================== --- head/sysutils/enteruser/pkg-plist Sat Nov 9 05:30:09 2013 (r333274) +++ head/sysutils/enteruser/pkg-plist Sat Nov 9 05:55:32 2013 (r333275) @@ -1,3 +1,2 @@ sbin/enteruser -@exec ln -f %D/sbin/enteruser %D/sbin/queueuser -@unexec rm -f %D/sbin/queueuser +sbin/queueuser Modified: head/sysutils/etcmerge/Makefile ============================================================================== --- head/sysutils/etcmerge/Makefile Sat Nov 9 05:30:09 2013 (r333274) +++ head/sysutils/etcmerge/Makefile Sat Nov 9 05:55:32 2013 (r333275) @@ -16,12 +16,10 @@ NO_WRKSUBDIR= yes SRC= ${.CURDIR}/src -MAN8= ${PORTNAME}.8 -PLIST_FILES= sbin/etcmerge +PLIST_FILES= man/man8/${PORTNAME}.8.gz sbin/etcmerge -NO_STAGE= yes do-install: - ${INSTALL_SCRIPT} ${SRC}/${PORTNAME}.sh ${PREFIX}/sbin/${PORTNAME} - ${INSTALL_MAN} ${SRC}/${PORTNAME}.8 ${PREFIX}/man/man8 + ${INSTALL_SCRIPT} ${SRC}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/sbin/${PORTNAME} + ${INSTALL_MAN} ${SRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8 .include <bsd.port.mk> Modified: head/sysutils/extipl/Makefile ============================================================================== --- head/sysutils/extipl/Makefile Sat Nov 9 05:30:09 2013 (r333274) +++ head/sysutils/extipl/Makefile Sat Nov 9 05:55:32 2013 (r333275) @@ -14,12 +14,10 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/na ONLY_FOR_ARCHS= i386 amd64 WRKSRC= ${WRKDIR}/${DISTNAME}/src +OPTIONS_DEFINE= DOCS -MAN8= ${PORTNAME}.8 -PORTDOCS= * -PLIST_FILES= sbin/${PORTNAME} +.include <bsd.port.options.mk> -NO_STAGE= yes post-patch: cd ${WRKSRC}; \ ${SED} -e 's|!!DOCDIR!!|${DOCSDIR}|g' \ @@ -28,13 +26,13 @@ post-patch: -e 's/(DIR)[\t]*[?]=/$$1=/;' Makefile do-install: - ${INSTALL_PROGRAM} -m 700 ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${MAN8PREFIX}/man/man8 + ${INSTALL_PROGRAM} -m 700 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/English - ${INSTALL_DATA} ${WRKSRC}/../doc/English/*.txt ${DOCSDIR}/English - @${MKDIR} ${DOCSDIR}/Japanese - ${INSTALL_DATA} ${WRKSRC}/../doc/Japanese/*.txt ${DOCSDIR}/Japanese + @${MKDIR} ${STAGEDIR}${DOCSDIR}/English + ${INSTALL_DATA} ${WRKSRC}/../doc/English/*.txt ${STAGEDIR}${DOCSDIR}/English + @${MKDIR} ${STAGEDIR}${DOCSDIR}/Japanese + ${INSTALL_DATA} ${WRKSRC}/../doc/Japanese/*.txt ${STAGEDIR}${DOCSDIR}/Japanese .endif .include <bsd.port.mk> Added: head/sysutils/extipl/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/extipl/pkg-plist Sat Nov 9 05:55:32 2013 (r333275) @@ -0,0 +1,11 @@ +man/man8/extipl.8.gz +sbin/extipl +%%PORTDOCS%%%%DOCSDIR%%/English/extipl.txt +%%PORTDOCS%%%%DOCSDIR%%/English/scorpius.txt +%%PORTDOCS%%%%DOCSDIR%%/English/techical.txt +%%PORTDOCS%%%%DOCSDIR%%/Japanese/extipl.txt +%%PORTDOCS%%%%DOCSDIR%%/Japanese/scorpius.txt +%%PORTDOCS%%%%DOCSDIR%%/Japanese/techical.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%%/Japanese +%%PORTDOCS%%@dirrm %%DOCSDIR%%/English +%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311090555.rA95tWRl032152>