From owner-svn-ports-head@FreeBSD.ORG  Sun Jun  7 15:08:01 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C6F4EE62;
 Sun,  7 Jun 2015 15:08:01 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B54DF1FBB;
 Sun,  7 Jun 2015 15:08:01 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t57F81TL011268;
 Sun, 7 Jun 2015 15:08:01 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t57F81KR011267;
 Sun, 7 Jun 2015 15:08:01 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201506071508.t57F81KR011267@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sun, 7 Jun 2015 15:08:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r388717 - head/www/geronimo
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Jun 2015 15:08:01 -0000

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>