Date: Fri, 20 Dec 2013 18:21:04 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337059 - in head/textproc/tdhkit: . files Message-ID: <201312201821.rBKIL47B077208@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Fri Dec 20 18:21:04 2013 New Revision: 337059 URL: http://svnweb.freebsd.org/changeset/ports/337059 Log: - Support CC/CFLAGS properly - Add LICENSE - Support staging PR: ports/184873 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Deleted: head/textproc/tdhkit/files/ Modified: head/textproc/tdhkit/Makefile (contents, props changed) head/textproc/tdhkit/pkg-plist (contents, props changed) Modified: head/textproc/tdhkit/Makefile ============================================================================== --- head/textproc/tdhkit/Makefile Fri Dec 20 18:18:37 2013 (r337058) +++ head/textproc/tdhkit/Makefile Fri Dec 20 18:21:04 2013 (r337059) @@ -10,65 +10,40 @@ DISTNAME= ${PORTNAME}${PORTVERSION:C/\./ MAINTAINER= ports@FreeBSD.org COMMENT= Set of programs for working with tabular ASCII data -OPTIONS_DEFINE= LIBCHRON DOCS -LIBCHRON_DESC= Install libchron +LICENSE= GPLv2 # (or later) -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MLIBCHRON} -PLIST_SUB+= LIBCHRON="" -.else -PLIST_SUB+= LIBCHRON="@comment " -.endif - -.if !defined(NO_INSTALL_MANPAGES) -MAN1= dateconvert.1 \ - fldfmt.1 \ - fldmap.1 \ - fldsel.1 \ - pjoin.1 \ - recsel.1 \ - tabo.1 \ - tdhfunction.1 \ - xlcells.1 \ - xlcleaner.1 - -.if ${PORT_OPTIONS:MLIBCHRON} -MAN3= libchron.3 -.endif -MANCOMPRESSED= no -.endif - -do-build: - cd ${WRKSRC}/libsrc && ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} - cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} -.if ${PORT_OPTIONS:MLIBCHRON} - cd ${WRKSRC}/libsrc && ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} libchron -.endif +OPTIONS_DEFINE= CHRON DOCS +OPTIONS_SUB= yes +CHRON_DESC= Install libchron + +BUILD_WRKSRC= ${WRKSRC}/src + +post-patch: + @${REINPLACE_CMD} -e \ + 's|^CFLAGS =|CFLAGS +=|' \ + ${WRKSRC}/libsrc/Makefile + @${REINPLACE_CMD} -e \ + 's|^CFLAGS =|CFLAGS +=| ; \ + s|^CC =|CC ?=| ; \ + /^all:/s|recsel fldsel|recsel fldmap fldsel|' \ + ${BUILD_WRKSRC}/Makefile + +pre-build: + @(cd ${WRKSRC}/libsrc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} \ + ${MAKE_ARGS} default libchron) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin - -.if ${PORT_OPTIONS:MLIBCHRON} - ${INSTALL_PROGRAM} ${WRKSRC}/libchron.a ${PREFIX}/lib -.endif - -.if !defined(NO_INSTALL_MANPAGES) -.for manpage in ${MAN1} - ${INSTALL_MAN} ${WRKSRC}/man/mantdh/${manpage} ${MAN1PREFIX}/man/man1 -.endfor -.if ${PORT_OPTIONS:MLIBCHRON} - ${INSTALL_MAN} ${WRKSRC}/man/mantdh/${MAN3} ${MAN3PREFIX}/man/man3 -.endif -.endif - -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/man/html/* ${DOCSDIR} -.endif + (cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} * \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_DATA} libchron.a \ + ${STAGEDIR}${PREFIX}/lib) + (cd ${WRKSRC}/man/mantdh && ${INSTALL_MAN} *.1 \ + ${STAGEDIR}${MAN1PREFIX}/man/man1) + (cd ${WRKSRC}/man/mantdh && ${INSTALL_MAN} *.3 \ + ${STAGEDIR}${MAN3PREFIX}/man/man3) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/man/html && ${INSTALL_DATA} * \ + ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/textproc/tdhkit/pkg-plist ============================================================================== --- head/textproc/tdhkit/pkg-plist Fri Dec 20 18:18:37 2013 (r337058) +++ head/textproc/tdhkit/pkg-plist Fri Dec 20 18:21:04 2013 (r337059) @@ -8,7 +8,18 @@ bin/tabo bin/tdhfunction bin/xlcells bin/xlcleaner -%%LIBCHRON%%lib/libchron.a +%%CHRON%%lib/libchron.a +man/man1/dateconvert.1.gz +man/man1/fldfmt.1.gz +man/man1/fldmap.1.gz +man/man1/fldsel.1.gz +man/man1/pjoin.1.gz +man/man1/recsel.1.gz +man/man1/tabo.1.gz +man/man1/tdhfunction.1.gz +man/man1/xlcells.1.gz +man/man1/xlcleaner.1.gz +man/man3/libchron.3.gz %%PORTDOCS%%%%DOCSDIR%%/Copyright.html %%PORTDOCS%%%%DOCSDIR%%/commalist.html %%PORTDOCS%%%%DOCSDIR%%/condex.html @@ -32,4 +43,4 @@ bin/xlcleaner %%PORTDOCS%%%%DOCSDIR%%/times.html %%PORTDOCS%%%%DOCSDIR%%/xlcells.1.html %%PORTDOCS%%%%DOCSDIR%%/xlcleaner.1.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312201821.rBKIL47B077208>