diff options
author | itetcu <itetcu@FreeBSD.org> | 2006-12-11 06:10:04 +0800 |
---|---|---|
committer | itetcu <itetcu@FreeBSD.org> | 2006-12-11 06:10:04 +0800 |
commit | c4b9f3b0b56c45c0218fe6f9b9a1eb0dde5486f3 (patch) | |
tree | ca40969642defcaa1500d3543bf42c6187a92283 /ports-mgmt/tinderbox-devel | |
parent | b733892a96cb82ec49645fe7bc29941d92c2dfd6 (diff) | |
download | freebsd-ports-gnome-c4b9f3b0b56c45c0218fe6f9b9a1eb0dde5486f3.tar.gz freebsd-ports-gnome-c4b9f3b0b56c45c0218fe6f9b9a1eb0dde5486f3.tar.zst freebsd-ports-gnome-c4b9f3b0b56c45c0218fe6f9b9a1eb0dde5486f3.zip |
- Fix path of csup for systems where csup is builded from the ports [1]
- fix deinstall when web interfaces are not installed
- don't install www[-exp] files and remove them afterwards, remove them after
build
- bump PORTREVISION
PR: 106556 [1]
Submitted by: Beat Gätzi [1]
Diffstat (limited to 'ports-mgmt/tinderbox-devel')
-rw-r--r-- | ports-mgmt/tinderbox-devel/Makefile | 29 | ||||
-rw-r--r-- | ports-mgmt/tinderbox-devel/pkg-plist | 10 |
2 files changed, 23 insertions, 16 deletions
diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile index 8c462e91f57b..7cb1b7aebebe 100644 --- a/ports-mgmt/tinderbox-devel/Makefile +++ b/ports-mgmt/tinderbox-devel/Makefile @@ -6,7 +6,7 @@ PORTNAME= tinderbox PORTVERSION= 2.3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://tinderbox.marcuscom.com/ @@ -103,21 +103,28 @@ post-patch: ${WRKSRC}/lib/setup-mysql.sh @${RM} ${WRKSRC}/lib/setup-mysql.sh.bak .endif +.if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 )) + ${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \ + ${WRKSRC}/create + ${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \ + ${WRKSRC}/tc + @${RM} ${WRKSRC}/create.bak + @${RM} ${WRKSRC}/tc.bak +.endif -do-install: - ${MKDIR} ${PREFIX}/tinderbox/scripts - ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts -.if !defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP) - @${ECHO_CMD} "Removing web interface componenets ..." - @${RM} -R ${PREFIX}/tinderbox/scripts/www - @${ECHO_CMD} "Done." +pre-install: +.if !defined(WITH_WEB) + ${RM} -R ${WRKSRC}/www .endif .if defined(WITHOUT_WEB_EXP) - @${ECHO_CMD} "Removing web interface componenets ..." - @${RM} -R ${PREFIX}/tinderbox/scripts/www-exp - @${ECHO_CMD} "Done." + ${RM} -R ${WRKSRC}/www-exp .endif + +do-install: + ${MKDIR} ${PREFIX}/tinderbox/scripts + ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts + post-install: cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 @${CAT} ${PKGMESSAGE} diff --git a/ports-mgmt/tinderbox-devel/pkg-plist b/ports-mgmt/tinderbox-devel/pkg-plist index fe178712e26c..fae32460582b 100644 --- a/ports-mgmt/tinderbox-devel/pkg-plist +++ b/ports-mgmt/tinderbox-devel/pkg-plist @@ -109,11 +109,11 @@ tinderbox/scripts/upgrade/mig_shlib.sh %%WEB%%tinderbox/scripts/www/showport.php %%WEB%%tinderbox/scripts/www/tinderstyle.css -@dirrm tinderbox/scripts/www-exp/templates/default -@dirrm tinderbox/scripts/www-exp/templates -@dirrm tinderbox/scripts/www-exp/module -@dirrm tinderbox/scripts/www-exp/core -@dirrm tinderbox/scripts/www +%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates/default +%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates +%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/module +%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/core +%%WEB%%@dirrm tinderbox/scripts/www @dirrm tinderbox/scripts/upgrade @dirrm tinderbox/scripts/man/man1 @dirrm tinderbox/scripts/man |