Date: Tue, 20 Feb 2007 04:32:03 +0800 (CST) From: Rong-En Fan <rafan@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lioux@FreeBSD.org Subject: ports/109335: [PATCH] sysutils/clockspeed: don't write things after post.mk Message-ID: <200702192032.l1JKW3hW075207@svm.csie.ntu.edu.tw> Resent-Message-ID: <200702192040.l1JKe6he072216@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109335 >Category: ports >Synopsis: [PATCH] sysutils/clockspeed: don't write things after post.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 19 20:40:06 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Rong-En Fan >Release: FreeBSD 6.2-PRERELEASE amd64 >Organization: NTU CSIE >Environment: >Description: - Move stuffs that are after post.mk to where appropriate - Use DOCSDIR These chages are tested with tinderbox (both NOPORTDOCS undefined and defined). Port maintainer (lioux@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- clockspeed-0.62_3.patch begins here --- Index: Makefile =================================================================== RCS file: /big/freebsd-cvsup/ncvs/ports/sysutils/clockspeed/Makefile,v retrieving revision 1.19 diff -u -u -r1.19 Makefile --- Makefile 13 May 2006 04:15:26 -0000 1.19 +++ Makefile 19 Feb 2007 20:30:30 -0000 @@ -23,7 +23,7 @@ MAN1= clockadd.1 clockspeed.1 clockview.1 sntpclock.1 \ taiclock.1 taiclockd.1 -PREFIX_FIX_FILES= ${WRKSRC}/leapsecs_read.c ${WRKSRC}/INSTALL +PREFIX_FIX_FILES= leapsecs_read.c INSTALL CLOCKSPEED_RC_SCRIPT_SAMPLE= ${FILESDIR}/clockspeed.sh.sample RC_SCRIPT_STARTUP_DIR= ${PREFIX}/etc/rc.d @@ -37,7 +37,12 @@ @${ECHO} hasclock_gettime.h >> ${WRKSRC}/${file} .endfor -post-patch: real-post-patch +post-patch: + @${SED} "s!/usr/local/!${PREFIX}!" ${CLOCKSPEED_RC_SCRIPT_SAMPLE} > \ + ${WRKDIR}/${CLOCKSPEED_RC_SCRIPT_SAMPLE:T} +.for file in ${PREFIX_FIX_FILES} + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file} +.endfor do-configure: @${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc @@ -47,24 +52,13 @@ post-build: @${CP} ${LOCALBASE}/etc/leapsecs.dat ${WRKSRC}/leapsecs.dat -post-install: real-post-install - -.include <bsd.port.post.mk> - -real-post-patch: - @${SED} "s!/usr/local/!${PREFIX}!" ${CLOCKSPEED_RC_SCRIPT_SAMPLE} > \ - ${WRKDIR}/${CLOCKSPEED_RC_SCRIPT_SAMPLE:T} -.for file in ${PREFIX_FIX_FILES} - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${file} -.endfor - -real-post-install: +post-install: .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \ - ${PREFIX}/share/doc/clockspeed - @${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/clockspeed + ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR} @${INSTALL_DATA} ${PKGMESSAGE} \ - ${PREFIX}/share/doc/clockspeed/INSTALL-FreeBSD + ${DOCSDIR}/INSTALL-FreeBSD .endif @${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \ ${PREFIX}/etc/clockspeed @@ -72,3 +66,5 @@ @${INSTALL_SCRIPT} ${WRKDIR}/${CLOCKSPEED_RC_SCRIPT_SAMPLE:T} \ ${RC_SCRIPT_STARTUP_DIR}/${CLOCKSPEED_RC_SCRIPT_SAMPLE:T} @${SED} s!/usr/local/!${PREFIX}/! ${PKGMESSAGE} + +.include <bsd.port.post.mk> Index: pkg-plist =================================================================== RCS file: /big/freebsd-cvsup/ncvs/ports/sysutils/clockspeed/pkg-plist,v retrieving revision 1.4 diff -u -u -r1.4 pkg-plist --- pkg-plist 25 May 2001 14:58:05 -0000 1.4 +++ pkg-plist 19 Feb 2007 20:30:30 -0000 @@ -4,9 +4,9 @@ bin/sntpclock bin/taiclock bin/taiclockd -%%PORTDOCS%%share/doc/clockspeed/INSTALL -%%PORTDOCS%%share/doc/clockspeed/INSTALL-FreeBSD -%%PORTDOCS%%@dirrm share/doc/clockspeed +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/INSTALL-FreeBSD +%%PORTDOCS%%@dirrm %%DOCSDIR%% @mode 0755 @exec mkdir %D/etc/clockspeed etc/clockspeed/leapsecs.dat --- clockspeed-0.62_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702192032.l1JKW3hW075207>