cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use PORTNAME instead of PORTDIRNAME so that the package does not depend on the

Browse Source 
directory the port lives in
This commit is contained in:
Baptiste Daroussin 2016-12-22 21:59:35 +00:00
parent 4e849256b1
commit 61df4405f6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=429189
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/madsonic/Makefile
View File

@ -133,11 +133,11 @@ pre-install:
@${ECHO} "@owner ${USER}" >> ${PLIST}
@${ECHO} "@group ${GROUP}" >> ${PLIST}
@cd ${WRKSRC}; ${FIND} . -type f | cut -c2- \
| ${SED} 's|^|${WEBAPPDIR:S,${PREFIX}/,,}/${PORTDIRNAME}|' \
| ${SED} 's|^|${WEBAPPDIR:S,${PREFIX}/,,}/${PORTNAME}|' \
| ${SORT} >> ${PLIST}
@${CAT} ${PKGDIR}/pkg-plist-chunk >> ${PLIST}
@cd ${WRKSRC}; ${FIND} . -type d | cut -c2- \
| ${SED} 's|^|@dir ${WEBAPPDIR:S,${PREFIX}/,,}/${PORTDIRNAME}|' \
| ${SED} 's|^|@dir ${WEBAPPDIR:S,${PREFIX}/,,}/${PORTNAME}|' \
| ${SORT} -r >> ${PLIST}
@${RM} ${PKGMESSAGE}
@${CAT} ${PKGDIR}/pkg-message-spacer >> ${PKGMESSAGE}
@ -148,7 +148,7 @@ pre-install:
@${CAT} ${PKGDIR}/pkg-message-spacer >> ${PKGMESSAGE}
do-install:
cd ${WRKDIR} && ${COPYTREE_SHARE} ${PORTDIRNAME} ${STAGEDIR}${WEBAPPDIR}
cd ${WRKDIR} && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${WEBAPPDIR}
${MKDIR} ${STAGEDIR}${MADSONIC_HOME}
${MKDIR} ${STAGEDIR}${MADSONIC_HOME}/transcode

8
www/sventon/Makefile
View File

@ -41,11 +41,11 @@ SHAREGRP= www
PLIST_SUB+= APPHOME=${APPHOME:S|^${PREFIX}/||}
post-extract:
@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
@${TAR} xf ${WRKSRC}/svn.war -C ${WRKDIR}/${PORTDIRNAME}
@${MKDIR} ${WRKDIR}/${PORTNAME}
@${TAR} xf ${WRKSRC}/svn.war -C ${WRKDIR}/${PORTNAME}
do-install:
${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${STAGEDIR}${APPHOME}/webapps/${PORTDIRNAME}
cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTDIRNAME}
${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}
cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}
.include <bsd.port.mk>