diff options
| author | bapt <bapt@FreeBSD.org> | 2016-12-23 05:59:35 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2016-12-23 05:59:35 +0800 |
| commit | b74775db011a9304667a04b5bcafdaca796c353c (patch) | |
| tree | ce7c054a65ad7c113f7ad5e0ad6e8b6dd1c2e84a /www | |
| parent | 50407231bf5b47f981b4705f179202021118e604 (diff) | |
| download | freebsd-ports-gnome-b74775db011a9304667a04b5bcafdaca796c353c.tar.gz freebsd-ports-gnome-b74775db011a9304667a04b5bcafdaca796c353c.tar.zst freebsd-ports-gnome-b74775db011a9304667a04b5bcafdaca796c353c.zip | |
Use PORTNAME instead of PORTDIRNAME so that the package does not depend on the
directory the port lives in
Diffstat (limited to 'www')
| -rw-r--r-- | www/madsonic/Makefile | 6 | ||||
| -rw-r--r-- | www/sventon/Makefile | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/www/madsonic/Makefile b/www/madsonic/Makefile index 777ec6136d30..e54a9eef46c0 100644 --- a/www/madsonic/Makefile +++ b/www/madsonic/Makefile @@ -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 diff --git a/www/sventon/Makefile b/www/sventon/Makefile index 765a7f5f62a3..290ec0b656dd 100644 --- a/www/sventon/Makefile +++ b/www/sventon/Makefile @@ -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> |