svn commit: r429188 - head/www/subsonic

Baptiste Daroussin bapt at FreeBSD.org
Thu Dec 22 21:56:43 UTC 2016


Author: bapt
Date: Thu Dec 22 21:56:42 2016
New Revision: 429188
URL: https://svnweb.freebsd.org/changeset/ports/429188

Log:
  Use PORTNAME instead of PORTDIRNAME so that the package does not depend on the
  directory the port lives in

Modified:
  head/www/subsonic/Makefile

Modified: head/www/subsonic/Makefile
==============================================================================
--- head/www/subsonic/Makefile	Thu Dec 22 21:48:49 2016	(r429187)
+++ head/www/subsonic/Makefile	Thu Dec 22 21:56:42 2016	(r429188)
@@ -128,11 +128,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}
@@ -143,7 +143,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}${SUBSONIC_HOME}
 	${MKDIR} ${STAGEDIR}${SUBSONIC_HOME}/transcode


More information about the svn-ports-all mailing list