From owner-svn-ports-head@freebsd.org Tue Sep 20 09:01:40 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3217BE2118; Tue, 20 Sep 2016 09:01:40 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 9018BF51; Tue, 20 Sep 2016 09:01:40 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8K91daA018297; Tue, 20 Sep 2016 09:01:39 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8K91dCU018296; Tue, 20 Sep 2016 09:01:39 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201609200901.u8K91dCU018296@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 20 Sep 2016 09:01:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422487 - head/graphics/deegree-csw 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.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Sep 2016 09:01:40 -0000 Author: amdmi3 Date: Tue Sep 20 09:01:39 2016 New Revision: 422487 URL: https://svnweb.freebsd.org/changeset/ports/422487 Log: - Add LICENSE - Switch to options helpers - Cosmetic fixes Modified: head/graphics/deegree-csw/Makefile Modified: head/graphics/deegree-csw/Makefile ============================================================================== --- head/graphics/deegree-csw/Makefile Tue Sep 20 09:00:47 2016 (r422486) +++ head/graphics/deegree-csw/Makefile Tue Sep 20 09:01:39 2016 (r422487) @@ -12,10 +12,13 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${ MAINTAINER= ports@FreeBSD.org COMMENT= Deegree Catalogue Service(CSW) +LICENSE= LGPL21+ + USES= zip USE_JAVA= yes NO_BUILD= yes +NO_ARCH= yes TOMCATDIR= ${PREFIX}/${TOMCATVER} APPHOME= ${LOCALBASE}/${TOMCATVER} WEBAPPDIR= ${TOMCATDIR}/webapps @@ -35,14 +38,14 @@ OPTIONS_DEFINE= DOCS .if ${PORT_OPTIONS:MTOMCAT6} TOMCATVER= apache-tomcat-6.0 -TCPORT= 8180 +TCPORT= 8180 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat6 .endif .if ${PORT_OPTIONS:MTOMCAT7} TOMCATVER= apache-tomcat-7.0 -TCPORT= 8080 +TCPORT= 8080 BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7 .endif @@ -52,9 +55,11 @@ post-extract: @${TAR} xf ${WRKDIR}/deegree-csw.war -C ${WRKDIR}/${PORTDIRNAME} do-install: - ${INSTALL} -d ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME} + @${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME} @cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WEBAPPDIR}/${PORTDIRNAME} - ${MKDIR} ${STAGEDIR}${DOCSDIR} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${STAGEDIR}${DOCSDIR} .include