Attachment 129128 Details for Bug 173091 – deegree-igeoportal.diff

[patch] deegree-igeoportal.diff

deegree-igeoportal.diff (text/x-patch), 2.40 KB, created by nemysis on 2012-10-26 14:45:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nemysis

Created: 2012-10-26 14:45:41 UTC

Size: 2.40 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/graphics/deegree-igeoportal/Makefile ./Makefile
>--- /usr/ports/graphics/deegree-igeoportal/Makefile	2012-10-21 23:41:06.000000000 +0200
>+++ ./Makefile	2012-10-26 15:45:09.000000000 +0200
>@@ -1,4 +1,4 @@
>-# Created by:                 wenheping@gmail.com
>+# Created by:		wenheping@gmail.com
> #
> # $FreeBSD: ports/graphics/deegree-igeoportal/Makefile,v 1.4 2012/10/21 21:41:06 jgh Exp $
> 
>@@ -13,36 +13,53 @@
> MAINTAINER=	wenheping@gmail.com
> COMMENT=	Browser based client handling WMS, WFS, and proxy service
> 
>-RUN_DEPENDS= ${LOCALBASE}/${TOMCATVER}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
>-
> USE_ZIP=	yes
> USE_JAVA=	1.5+
>-
> NO_BUILD=	yes
>-TOMCATVER=	apache-tomcat-6.0
>+
> TOMCATDIR=	${PREFIX}/${TOMCATVER}
>+APPHOME=	${LOCALBASE}/${TOMCATVER}
> WEBAPPDIR=	${TOMCATDIR}/webapps
>-PORTDOCS=	*
>+
>+PORTDOCS=	README.txt README_owswatch.txt deegree_igeoportal_documentation_en.pdf
> DOCSDIR=	${PREFIX}/share/doc/deegree-igeoportal
>+
> PLIST_SUB=	TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||}
> 
>-post-extract:
>-	@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
>-	@${TAR} xf ${WRKDIR}/igeoportal-std.war -C ${WRKDIR}/${PORTDIRNAME}
>+OPTIONS_SINGLE=	AS
>+OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7
>+OPTIONS_DEFAULT=	TOMCAT6
> 
> .include <bsd.port.options.mk>
> 
>+.if ${PORT_OPTIONS:MTOMCAT6}
>+TOMCATVER=	apache-tomcat-6.0
>+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
>+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
>+.endif
>+
>+.if ${PORT_OPTIONS:MTOMCAT7}
>+TOMCATVER=	apache-tomcat-7.0
>+BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
>+RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
>+.endif
>+
>+post-extract:
>+	${MKDIR} ${WRKDIR}/${PORTDIRNAME}
>+	${TAR} xf ${WRKDIR}/igeoportal-std.war -C ${WRKDIR}/${PORTDIRNAME}
>+
> do-install:
> 		${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${TOMCATDIR}/webapps/${PORTDIRNAME}
>-		@cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME}
>+		@(cd ${WRKDIR}/${PORTDIRNAME} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${PORTDIRNAME})
> 
> .if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKDIR}/deegree_igeoportal_documentation_en.pdf ${DOCSDIR}
>+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/|} ${DOCSDIR}
> .endif
> 
> post-install:
>+	@${ECHO_CMD}
> 	@${CAT} ${PKGMESSAGE}
>+	@${ECHO_CMD}
> 
> .include <bsd.port.mk>
>===> Done

Actions: View | Diff

Attachments on bug 173091: 129126 | 129127 | 129128