Date: Thu, 22 Dec 2016 21:59:35 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429189 - in head/www: madsonic sventon Message-ID: <201612222159.uBMLxZI3063063@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Dec 22 21:59:35 2016 New Revision: 429189 URL: https://svnweb.freebsd.org/changeset/ports/429189 Log: Use PORTNAME instead of PORTDIRNAME so that the package does not depend on the directory the port lives in Modified: head/www/madsonic/Makefile head/www/sventon/Makefile Modified: head/www/madsonic/Makefile ============================================================================== --- head/www/madsonic/Makefile Thu Dec 22 21:56:42 2016 (r429188) +++ head/www/madsonic/Makefile Thu Dec 22 21:59:35 2016 (r429189) @@ -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 Modified: head/www/sventon/Makefile ============================================================================== --- head/www/sventon/Makefile Thu Dec 22 21:56:42 2016 (r429188) +++ head/www/sventon/Makefile Thu Dec 22 21:59:35 2016 (r429189) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612222159.uBMLxZI3063063>