Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Jun 2015 15:08:01 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388717 - head/www/geronimo
Message-ID:  <201506071508.t57F81KR011267@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun Jun  7 15:08:01 2015
New Revision: 388717
URL: https://svnweb.freebsd.org/changeset/ports/388717

Log:
  - Add CPE info
  - Modernize plist

Modified:
  head/www/geronimo/Makefile

Modified: head/www/geronimo/Makefile
==============================================================================
--- head/www/geronimo/Makefile	Sun Jun  7 15:07:49 2015	(r388716)
+++ head/www/geronimo/Makefile	Sun Jun  7 15:08:01 2015	(r388717)
@@ -15,7 +15,11 @@ USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-NO_BUILD=	YES
+NO_BUILD=	yes
+
+CPE_VENDOR=	apache
+CPE_VERSION=	${DISTVERSION:C/-.*//}
+CPE_UPDATE=	${DISTVERSION:C/[^-]*((-.*)?)/\1/:C/-//g}
 
 USE_RC_SUBR=	geronimo3
 SUB_FILES=	pkg-deinstall
@@ -89,7 +93,7 @@ post-install:
 	@${FIND} -s ${WRKSRC} -not -type d | \
 		 ${SED} -ne 's,^${WRKSRC},${APP_HOME:S,${PREFIX}/,,},p' >> ${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC} -type d | \
-		 ${SED} -ne 's,^${WRKSRC},@dirrm ${APP_HOME:S,${PREFIX}/,,},p' >> ${TMPPLIST}
+		 ${SED} -ne 's,^${WRKSRC},@dir ${APP_HOME:S,${PREFIX}/,,},p' >> ${TMPPLIST}
 	@${ECHO_CMD} -e '@owner root\n@group wheel' >> ${TMPPLIST}
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506071508.t57F81KR011267>