Date: Tue, 22 Oct 2013 21:52:00 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331328 - in head/textproc: colordiff fldiff htmlise rtf2html uni2ascii xlreader xmlindent Message-ID: <201310222152.r9MLq07k066433@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Tue Oct 22 21:51:59 2013 New Revision: 331328 URL: http://svnweb.freebsd.org/changeset/ports/331328 Log: Support staging Modified: head/textproc/colordiff/Makefile head/textproc/colordiff/pkg-plist head/textproc/fldiff/Makefile head/textproc/fldiff/pkg-plist head/textproc/htmlise/Makefile head/textproc/rtf2html/Makefile head/textproc/uni2ascii/Makefile head/textproc/xlreader/Makefile head/textproc/xmlindent/Makefile Modified: head/textproc/colordiff/Makefile ============================================================================== --- head/textproc/colordiff/Makefile Tue Oct 22 21:42:38 2013 (r331327) +++ head/textproc/colordiff/Makefile Tue Oct 22 21:51:59 2013 (r331328) @@ -16,18 +16,15 @@ NO_BUILD= yes SHEBANG_FILES= colordiff.pl -MAN1= colordiff.1 - -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/${MAN1} + @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/${PORTNAME}.1 do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME} - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/colordiffrc ${PREFIX}/etc/colordiffrc.default -.if !exists(${PREFIX}/etc/colordiffrc) - ${INSTALL_DATA} ${WRKSRC}/colordiffrc ${PREFIX}/etc + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/colordiffrc ${STAGEDIR}${PREFIX}/etc/colordiffrc.default +.if !exists(${STAGEDIR}${PREFIX}/etc/colordiffrc) + ${INSTALL_DATA} ${WRKSRC}/colordiffrc ${STAGEDIR}${PREFIX}/etc .endif .include <bsd.port.mk> Modified: head/textproc/colordiff/pkg-plist ============================================================================== --- head/textproc/colordiff/pkg-plist Tue Oct 22 21:42:38 2013 (r331327) +++ head/textproc/colordiff/pkg-plist Tue Oct 22 21:51:59 2013 (r331328) @@ -1,4 +1,5 @@ bin/colordiff +man/man1/colordiff.1.gz @unexec if cmp -s %D/etc/colordiffrc %D/etc/colordiffrc.default; then rm -f %D/etc/colordiffrc; fi etc/colordiffrc.default @exec [ -f %B/colordiffrc ] || cp %B/%f %B/colordiffrc Modified: head/textproc/fldiff/Makefile ============================================================================== --- head/textproc/fldiff/Makefile Tue Oct 22 21:42:38 2013 (r331327) +++ head/textproc/fldiff/Makefile Tue Oct 22 21:51:59 2013 (r331328) @@ -20,12 +20,10 @@ GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAN1= fldiff.1 PORTDOCS= index.html fldiff.jpg OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -34,13 +32,13 @@ post-patch: ${WRKSRC}/fldiff.desktop do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/fldiff ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/fldiff.man ${MAN1PREFIX}/man/man1/fldiff.1 - ${INSTALL_DATA} ${WRKSRC}/fldiff.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/fldiff.png ${PREFIX}/share/pixmaps + ${INSTALL_PROGRAM} ${WRKSRC}/fldiff ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/fldiff.man ${STAGEDIR}${MAN1PREFIX}/man/man1/fldiff.1 + ${INSTALL_DATA} ${WRKSRC}/fldiff.desktop ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/fldiff.png ${STAGEDIR}${PREFIX}/share/pixmaps .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/textproc/fldiff/pkg-plist ============================================================================== --- head/textproc/fldiff/pkg-plist Tue Oct 22 21:42:38 2013 (r331327) +++ head/textproc/fldiff/pkg-plist Tue Oct 22 21:51:59 2013 (r331328) @@ -1,3 +1,4 @@ bin/fldiff +man/man1/fldiff.1.gz share/applications/fldiff.desktop share/pixmaps/fldiff.png Modified: head/textproc/htmlise/Makefile ============================================================================== --- head/textproc/htmlise/Makefile Tue Oct 22 21:42:38 2013 (r331327) +++ head/textproc/htmlise/Makefile Tue Oct 22 21:51:59 2013 (r331328) @@ -15,7 +15,6 @@ TABSIZE?= 8 SRC= htmlise tables markup inline PLIST_FILES= bin/htmlise -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|\(TABSIZE\ \)[0-9]*|\1${TABSIZE}|' \ ${WRKSRC}/${PORTNAME}.h @@ -27,6 +26,6 @@ do-build: ${CC} ${CFLAGS} -o ${WRKSRC}/${PORTNAME} ${SRC:C/(.*)/${WRKSRC}\/\1.o/} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/textproc/rtf2html/Makefile ============================================================================== --- head/textproc/rtf2html/Makefile Tue Oct 22 21:42:38 2013 (r331327) +++ head/textproc/rtf2html/Makefile Tue Oct 22 21:51:59 2013 (r331328) @@ -13,11 +13,10 @@ PLIST_FILES= bin/rtf2html WRKSRC= ${WRKDIR}/${PORTNAME} -NO_STAGE= yes do-build: ${CC} ${CFLAGS} ${WRKSRC}/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/textproc/uni2ascii/Makefile ============================================================================== --- head/textproc/uni2ascii/Makefile Tue Oct 22 21:42:38 2013 (r331327) +++ head/textproc/uni2ascii/Makefile Tue Oct 22 21:51:59 2013 (r331328) @@ -17,14 +17,13 @@ USE_BZIP2= yes MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -MAN1= uni2ascii.1 ascii2uni.1 -PLIST_FILES= bin/uni2ascii bin/ascii2uni +PLIST_FILES= bin/uni2ascii bin/ascii2uni man/man1/uni2ascii.1.gz \ + man/man1/ascii2uni.1.gz -NO_STAGE= yes do-install: .for f in ${PORTNAME} ascii2uni - ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${f}.1 ${MAN1PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .endfor .include <bsd.port.mk> Modified: head/textproc/xlreader/Makefile ============================================================================== --- head/textproc/xlreader/Makefile Tue Oct 22 21:42:38 2013 (r331327) +++ head/textproc/xlreader/Makefile Tue Oct 22 21:51:59 2013 (r331328) @@ -12,13 +12,12 @@ COMMENT= Convert .xls spread sheets to t PLIST_FILES= bin/xlreader -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|-L/usr/local/lib||; s|^CFLAGS=.*||; s|gcc|${CC}|' \ ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/textproc/xmlindent/Makefile ============================================================================== --- head/textproc/xmlindent/Makefile Tue Oct 22 21:42:38 2013 (r331327) +++ head/textproc/xmlindent/Makefile Tue Oct 22 21:51:59 2013 (r331328) @@ -16,17 +16,15 @@ MANCOMPRESSED= no SOURCES= error.c indent.c buffer.c main.c -MAN1= xmlindent.1 -PLIST_FILES= bin/xmlindent +PLIST_FILES= bin/xmlindent man/man1/xmlindent.1.gz -NO_STAGE= yes do-build: @cd ${WRKSRC}; flex xmlindent.yy ${CC} ${CFLAGS} ${SOURCES:C/(.*)/${WRKSRC}\/\1/} \ -o ${WRKSRC}/${PORTNAME} -lfl do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310222152.r9MLq07k066433>