mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
- 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]
This commit is contained in:
parent
91e6b9f468
commit
1e136d15ba
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=179423
@ -6,7 +6,7 @@
|
||||
|
||||
PORTNAME= tinderbox
|
||||
PORTVERSION= 2.3.4
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= http://tinderbox.marcuscom.com/
|
||||
|
||||
@ -103,20 +103,27 @@ 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
|
||||
|
||||
pre-install:
|
||||
.if !defined(WITH_WEB)
|
||||
${RM} -R ${WRKSRC}/www
|
||||
.endif
|
||||
.if defined(WITHOUT_WEB_EXP)
|
||||
${RM} -R ${WRKSRC}/www-exp
|
||||
.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."
|
||||
.endif
|
||||
.if defined(WITHOUT_WEB_EXP)
|
||||
@${ECHO_CMD} "Removing web interface componenets ..."
|
||||
@${RM} -R ${PREFIX}/tinderbox/scripts/www-exp
|
||||
@${ECHO_CMD} "Done."
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
|
||||
|
@ -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
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
PORTNAME= tinderbox
|
||||
PORTVERSION= 2.3.4
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= http://tinderbox.marcuscom.com/
|
||||
|
||||
@ -103,20 +103,27 @@ 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
|
||||
|
||||
pre-install:
|
||||
.if !defined(WITH_WEB)
|
||||
${RM} -R ${WRKSRC}/www
|
||||
.endif
|
||||
.if defined(WITHOUT_WEB_EXP)
|
||||
${RM} -R ${WRKSRC}/www-exp
|
||||
.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."
|
||||
.endif
|
||||
.if defined(WITHOUT_WEB_EXP)
|
||||
@${ECHO_CMD} "Removing web interface componenets ..."
|
||||
@${RM} -R ${PREFIX}/tinderbox/scripts/www-exp
|
||||
@${ECHO_CMD} "Done."
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
|
||||
|
@ -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
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
PORTNAME= tinderbox
|
||||
PORTVERSION= 2.3.4
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= http://tinderbox.marcuscom.com/
|
||||
|
||||
@ -103,20 +103,27 @@ 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
|
||||
|
||||
pre-install:
|
||||
.if !defined(WITH_WEB)
|
||||
${RM} -R ${WRKSRC}/www
|
||||
.endif
|
||||
.if defined(WITHOUT_WEB_EXP)
|
||||
${RM} -R ${WRKSRC}/www-exp
|
||||
.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."
|
||||
.endif
|
||||
.if defined(WITHOUT_WEB_EXP)
|
||||
@${ECHO_CMD} "Removing web interface componenets ..."
|
||||
@${RM} -R ${PREFIX}/tinderbox/scripts/www-exp
|
||||
@${ECHO_CMD} "Done."
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user