Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Sep 2004 15:23:56 +0800 (CST)
From:      Yen-Ming Lee <leeym@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        francisco@gomezmarin.com
Subject:   ports/71991: [PATCH] sysutils/tct: make it PREFIX clean
Message-ID:  <20040922072356.B7CA23E9D09@utopia.leeym.com>
Resent-Message-ID: <200409220730.i8M7UPBO025438@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         71991
>Category:       ports
>Synopsis:       [PATCH] sysutils/tct: make it PREFIX clean
>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:   Wed Sep 22 07:30:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.3-BETA4 i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-BETA4 FreeBSD 5.3-BETA4 #7: Mon Sep 13 05:12:30 CST 2004
>Description:

- utilize DOCSDIR
- handle PKGMESSAGE by using REINPLACE_CMD
- make this port PREFIX clean

Port maintainer (francisco@gomezmarin.com) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- tct-1.14.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/tct/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- Makefile	21 May 2004 23:24:04 -0000	1.5
+++ Makefile	22 Sep 2004 07:22:33 -0000
@@ -15,6 +15,7 @@
 COMMENT=	Analyzer for forensic data
 
 USE_PERL5=	yes
+PKGMESSAGE=	${WRKSRC}/pkg-message
 
 MAN1=		file-tct.1 ils.1 mactime.1 md5-tct.1 pcat.1 grave-robber.1 lastcomm.1 major_minor.1 timeout.1 icat.1 lazarus.1 unrm.1
 MAN5=		magic.5 tm-format.5
@@ -23,11 +24,14 @@
 
 .include <bsd.port.pre.mk>
 
+post-patch:
+	${SED} -e 's,/usr/local,${PREFIX},g' pkg-message > ${PKGMESSAGE}
+
 do-install:
-	${MKDIR} ${PREFIX}/share/doc/tct/lib
-	${MKDIR} ${PREFIX}/share/doc/tct/lazarus
-	${MKDIR} ${PREFIX}/share/doc/tct/etc
-	${MKDIR} ${PREFIX}/share/doc/tct/bin
+	${MKDIR} ${DOCSDIR}/lib
+	${MKDIR} ${DOCSDIR}/lazarus
+	${MKDIR} ${DOCSDIR}/etc
+	${MKDIR} ${DOCSDIR}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/file ${PREFIX}/bin/file-tct
 	${INSTALL_DATA} -m 555 ${WRKSRC}/bin/grave-robber ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/icat ${PREFIX}/bin
@@ -35,8 +39,8 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/lastcomm ${PREFIX}/bin
 	${INSTALL_DATA} -m 555 ${WRKSRC}/bin/mactime ${PREFIX}/bin
 	${INSTALL_DATA} -m 555 ${WRKSRC}/lazarus/lazarus ${PREFIX}/bin
-	${LN} -s ${PREFIX}/bin/lazarus ${LOCALBASE}/share/doc/tct/lazarus/lazarus
-	${LN} -s ${PREFIX}/bin/file-tct ${LOCALBASE}/share/doc/tct/bin/file
+	${LN} -s ${PREFIX}/bin/lazarus ${DOCSDIR}/lazarus/lazarus
+	${LN} -s ${PREFIX}/bin/file-tct ${DOCSDIR}/bin/file
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/major_minor ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/md5 ${PREFIX}/bin/md5-tct
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcat ${PREFIX}/bin
@@ -45,29 +49,27 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/timeout ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/man1/file.1 ${PREFIX}/man/man1/file-tct.1
 	${INSTALL_MAN} ${WRKSRC}/man/man1/md5.1 ${PREFIX}/man/man1/md5-tct.1
-	${CP} -Rp ${WRKSRC}/lib ${PREFIX}/share/doc/tct
-	${CP} ${WRKSRC}/lib/savecore.pl ${SITE_PERL}
-	${CP} ${WRKSRC}/conf/paths.pl ${SITE_PERL}
+	${CP} -Rp ${WRKSRC}/lib ${DOCSDIR}
+	${MKDIR} ${PREFIX}/${SITE_PERL_REL}
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/savecore.pl ${PREFIX}/${SITE_PERL_REL}
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/paths.pl ${PREFIX}/${SITE_PERL_REL}
 
 post-install:
 .if !defined(NOPORTDOCS)
 .for file in ${MYPORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/tct
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-
-.for file in ${MAN1:S/file-tct.1//:S/md5-tct.1//}
-	${INSTALL_MAN} ${WRKSRC}/man/man1/${file} ${PREFIX}/man/man1
+.for f in ${MAN1:S/file-tct.1//:S/md5-tct.1//}
+	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${PREFIX}/man/man1
 .endfor
-
-.for file in ${MAN5}
-	${INSTALL_MAN} ${WRKSRC}/man/man5/${file} ${PREFIX}/man/man5
+.for f in ${MAN5}
+	${INSTALL_MAN} ${WRKSRC}/man/man5/${f} ${PREFIX}/man/man5
 .endfor
-
-	${MKDIR} ${PREFIX}/share/doc/tct/conf
-	${CP} ${WRKSRC}/conf/* ${PREFIX}/share/doc/tct/conf
-	${CP} ${WRKSRC}/etc/magic ${PREFIX}/share/doc/tct/etc
-	${CP} ${WRKSRC}/src/file/Magdir/magic ${PREFIX}/share/doc/tct/etc
+	${MKDIR} ${DOCSDIR}/conf
+	${INSTALL_DATA} ${WRKSRC}/conf/* ${DOCSDIR}/conf
+	${INSTALL_DATA} ${WRKSRC}/etc/magic ${DOCSDIR}/etc
+	${INSTALL_DATA} ${WRKSRC}/src/file/Magdir/magic ${DOCSDIR}/etc
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/tct/pkg-plist,v
retrieving revision 1.3
diff -u -u -r1.3 pkg-plist
--- pkg-plist	21 May 2004 23:24:04 -0000	1.3
+++ pkg-plist	22 Sep 2004 07:22:33 -0000
@@ -1,27 +1,27 @@
-share/doc/tct/README
-share/doc/tct/CHANGES
-share/doc/tct/COPYRIGHT
-share/doc/tct/INSTALL
-share/doc/tct/LICENSE
-share/doc/tct/MANIFEST
-share/doc/tct/OS-NOTES
-share/doc/tct/README.FIRST
-share/doc/tct/TODO
-share/doc/tct/design-notes
-share/doc/tct/grave-robber.README
-share/doc/tct/lazarus.README
-share/doc/tct/mac.README
-share/doc/tct/conf/coroner.cf
-share/doc/tct/conf/grave-robber.cf
-share/doc/tct/conf/lazarus.cf
-share/doc/tct/conf/look@first
-share/doc/tct/conf/mac_file.lst
-share/doc/tct/conf/mac_file.headers
-share/doc/tct/conf/paths.pl
-share/doc/tct/conf/paths.pl.old
-share/doc/tct/conf/save_these_files
-share/doc/tct/lazarus/lazarus
-share/doc/tct/bin/file
+%%DOCSDIR%%/README
+%%DOCSDIR%%/CHANGES
+%%DOCSDIR%%/COPYRIGHT
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/LICENSE
+%%DOCSDIR%%/MANIFEST
+%%DOCSDIR%%/OS-NOTES
+%%DOCSDIR%%/README.FIRST
+%%DOCSDIR%%/TODO
+%%DOCSDIR%%/design-notes
+%%DOCSDIR%%/grave-robber.README
+%%DOCSDIR%%/lazarus.README
+%%DOCSDIR%%/mac.README
+%%DOCSDIR%%/conf/coroner.cf
+%%DOCSDIR%%/conf/grave-robber.cf
+%%DOCSDIR%%/conf/lazarus.cf
+%%DOCSDIR%%/conf/look@first
+%%DOCSDIR%%/conf/mac_file.lst
+%%DOCSDIR%%/conf/mac_file.headers
+%%DOCSDIR%%/conf/paths.pl
+%%DOCSDIR%%/conf/paths.pl.old
+%%DOCSDIR%%/conf/save_these_files
+%%DOCSDIR%%/lazarus/lazarus
+%%DOCSDIR%%/bin/file
 bin/ils
 bin/grave-robber
 bin/lastcomm
@@ -35,49 +35,49 @@
 bin/icat
 bin/md5-tct
 bin/file-tct
-share/doc/tct/lib/body_init.pl
-share/doc/tct/lib/bsd.pl
-share/doc/tct/lib/chk_binaries.pl
-share/doc/tct/lib/command.pl
-share/doc/tct/lib/crunch.pl
-share/doc/tct/lib/date.pl
-share/doc/tct/lib/datez.pl
-share/doc/tct/lib/dig-sig.pl
-share/doc/tct/lib/file_mode.pl
-share/doc/tct/lib/getopts.pl
-share/doc/tct/lib/hostname.pl
-share/doc/tct/lib/is_able.pl
-share/doc/tct/lib/linux.pl
-share/doc/tct/lib/logger.pl
-share/doc/tct/lib/major_minor.pl
-share/doc/tct/lib/maj_min_walk.pl
-share/doc/tct/lib/misc.pl
-share/doc/tct/lib/ostype.pl
-share/doc/tct/lib/pass.cache.pl
-share/doc/tct/lib/print_table.pl
-share/doc/tct/lib/proc.pl
-share/doc/tct/lib/process_dirs.pl
-share/doc/tct/lib/ps_spy.pl
-share/doc/tct/lib/rawdev.pl
-share/doc/tct/lib/realpath.pl
-share/doc/tct/lib/save_the_files.pl
-share/doc/tct/lib/savecore.pl
+%%DOCSDIR%%/lib/body_init.pl
+%%DOCSDIR%%/lib/bsd.pl
+%%DOCSDIR%%/lib/chk_binaries.pl
+%%DOCSDIR%%/lib/command.pl
+%%DOCSDIR%%/lib/crunch.pl
+%%DOCSDIR%%/lib/date.pl
+%%DOCSDIR%%/lib/datez.pl
+%%DOCSDIR%%/lib/dig-sig.pl
+%%DOCSDIR%%/lib/file_mode.pl
+%%DOCSDIR%%/lib/getopts.pl
+%%DOCSDIR%%/lib/hostname.pl
+%%DOCSDIR%%/lib/is_able.pl
+%%DOCSDIR%%/lib/linux.pl
+%%DOCSDIR%%/lib/logger.pl
+%%DOCSDIR%%/lib/major_minor.pl
+%%DOCSDIR%%/lib/maj_min_walk.pl
+%%DOCSDIR%%/lib/misc.pl
+%%DOCSDIR%%/lib/ostype.pl
+%%DOCSDIR%%/lib/pass.cache.pl
+%%DOCSDIR%%/lib/print_table.pl
+%%DOCSDIR%%/lib/proc.pl
+%%DOCSDIR%%/lib/process_dirs.pl
+%%DOCSDIR%%/lib/ps_spy.pl
+%%DOCSDIR%%/lib/rawdev.pl
+%%DOCSDIR%%/lib/realpath.pl
+%%DOCSDIR%%/lib/save_the_files.pl
+%%DOCSDIR%%/lib/savecore.pl
 %%SITE_PERL%%/savecore.pl
 %%SITE_PERL%%/paths.pl
-share/doc/tct/lib/solaris.pl
-share/doc/tct/lib/stat.pl
-share/doc/tct/lib/suck_free_inodes.pl
-share/doc/tct/lib/suck_table.pl
-share/doc/tct/lib/sunos.pl
-share/doc/tct/lib/system_stubs.pl
-share/doc/tct/lib/tm_misc.pl
-share/doc/tct/lib/tree.pl
-share/doc/tct/lib/trust.pl
-share/doc/tct/lib/vault_cp.pl
-share/doc/tct/etc/magic
-@dirrm share/doc/tct/conf
-@dirrm share/doc/tct/lib
-@dirrm share/doc/tct/lazarus
-@dirrm share/doc/tct/etc
-@dirrm share/doc/tct/bin
-@dirrm share/doc/tct
+%%DOCSDIR%%/lib/solaris.pl
+%%DOCSDIR%%/lib/stat.pl
+%%DOCSDIR%%/lib/suck_free_inodes.pl
+%%DOCSDIR%%/lib/suck_table.pl
+%%DOCSDIR%%/lib/sunos.pl
+%%DOCSDIR%%/lib/system_stubs.pl
+%%DOCSDIR%%/lib/tm_misc.pl
+%%DOCSDIR%%/lib/tree.pl
+%%DOCSDIR%%/lib/trust.pl
+%%DOCSDIR%%/lib/vault_cp.pl
+%%DOCSDIR%%/etc/magic
+@dirrm %%DOCSDIR%%/conf
+@dirrm %%DOCSDIR%%/lib
+@dirrm %%DOCSDIR%%/lazarus
+@dirrm %%DOCSDIR%%/etc
+@dirrm %%DOCSDIR%%/bin
+@dirrm %%DOCSDIR%%
--- tct-1.14.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?20040922072356.B7CA23E9D09>