Attachment 154880 Details for Bug 198961 – adding CPE information to Makefile (+ fix some whitespaces)

[patch] adding CPE information to Makefile (+ fix some whitespaces)

patch-Makefile (text/plain), 1.56 KB, created by shun on 2015-03-27 20:23:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: shun

Created: 2015-03-27 20:23:51 UTC

Size: 1.56 KB

patch

obsolete

>--- Makefile.orig	2015-03-27 11:08:51.613039829 +0100
>+++ Makefile	2015-03-27 11:10:45.099059160 +0100
>@@ -14,7 +14,8 @@
> USE_RC_SUBR=		${PORTNAME}
> USE_JAVA=		yes
> JAVA_VERSION=		1.6
>-USES=			python
>+USES=			cpe python
>+CPE_VENDOR=	apache
> MAKE_ENV=		JAVA_HOME=${JAVA_HOME}
> WRKSRC=			${WRKDIR}/${PDISTNAME}
> APP_NAME?=		${PORTNAME}
>@@ -79,23 +80,23 @@
> 	${CP} ${WRKSRC}/build.properties ${WRKSRC}/local.build.properties
> .if ! ${PORT_OPTIONS:MDOCS}
> 	${REINPLACE_CMD} \
>-       	-e 's/^#$exclude.webapp.documentation=$/\1/' \
>-       	-e 's/^#$exclude.webapp.javadocs=$/\1/' \
>-       	-e 's/^#$exclude.documentation=$/\1/' \
>-       	-e 's/^#$exclude.javadocs=$/\1/' \
>-       	${WRKSRC}/local.build.properties
>+		-e 's/^#$exclude.webapp.documentation=$/\1/' \
>+		-e 's/^#$exclude.webapp.javadocs=$/\1/' \
>+		-e 's/^#$exclude.documentation=$/\1/' \
>+		-e 's/^#$exclude.javadocs=$/\1/' \
>+		${WRKSRC}/local.build.properties
> .endif
> .if ! ${PORT_OPTIONS:MSAMPLES}
> 	${REINPLACE_CMD} \
>-       	-e 's/^#$exclude.webapp.samples=$/\1/' \
>-       	-e 's/^#$exclude.webapp.test-suite=$/\1/' \
>-       	${WRKSRC}/local.build.properties
>+		-e 's/^#$exclude.webapp.samples=$/\1/' \
>+		-e 's/^#$exclude.webapp.test-suite=$/\1/' \
>+		${WRKSRC}/local.build.properties
> .endif
> # Include Java source code into the binary jar files
> .if (defined(WITH_SOURCES))
> 	${REINPLACE_CMD} \
>-       	-e 's/^#$include.sources-in-jars=$/\1/' \
>-       	${WRKSRC}/local.build.properties
>+		-e 's/^#$include.sources-in-jars=$/\1/' \
>+		${WRKSRC}/local.build.properties
> .endif
> 
> pre-build:

Actions: View | Diff

Attachments on bug 198961: 154880