Date: Sun, 2 Feb 2014 19:40:38 GMT From: Hardy Schumacher <hardy.schumacher@gmx.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/186388: [UPDATE] devel/log4j to v1.2.17 Message-ID: <201402021940.s12Jec0u080662@oldred.freebsd.org> Resent-Message-ID: <201402021950.s12Jo0j5085320@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186388
>Category: ports
>Synopsis: [UPDATE] devel/log4j to v1.2.17
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 02 19:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Hardy Schumacher
>Release: FreeBSD-9.2
>Organization:
>Environment:
FreeBSD gamma.low.org 9.2-RELEASE-p3 FreeBSD 9.2-RELEASE-p3 #0 r260887: Mon Jan 20 19:57:49 CET 2014 root@gamma.low.org:/usr/obj/usr/src/sys/LOW_GAMMA i386
>Description:
Update of port devel/log4j to v1.2.17 is available. It contains bugfixes.
Furthermore this PR contains:
- stage support
- conversion to options framework
- license
>How-To-Repeat:
n/a
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/devel/log4j/Makefile ./log4j/Makefile
--- /usr/ports/devel/log4j/Makefile 2014-01-22 18:34:18.000000000 +0100
+++ ./log4j/Makefile 2014-02-02 20:01:03.000000000 +0100
@@ -2,48 +2,58 @@
# $FreeBSD: head/devel/log4j/Makefile 340722 2014-01-22 17:00:46Z mat $
PORTNAME= log4j
-PORTVERSION= 1.2.16
+PORTVERSION= 1.2.17
CATEGORIES= devel java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= logging/${PORTNAME}/${PORTVERSION}
-DISTNAME= apache-${PORTNAME}-${PORTVERSION}
MAINTAINER= hq@FreeBSD.org
COMMENT= A fast and flexible logging library for Java
+LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
USE_JAVA= YES
NO_BUILD= YES
+WRKSRC= ${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}
+
+OPTIONS_DEFINE= DOCS EXAMPLES
+OPTIONS_DEFAULT= DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
+
PLIST_FILES= %%JAVAJARDIR%%/log4j.jar
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= *
.endif
-NO_STAGE= yes
do-install:
- @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
- @${INSTALL_DATA} ${WRKSRC}/log4j-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
+ @${ECHO_MSG} -n ">> Installing JAR as ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar..."
+ @${INSTALL_DATA} ${WRKSRC}/log4j-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
- @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
+.if ${PORT_OPTIONS:MDOCS}
+ @${ECHO_MSG} -n ">> Installing documentation in ${STAGEDIR}${DOCSDIR}/..."
@cd ${WRKSRC}/site \
- && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
- && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+ && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
+ && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
@${ECHO_MSG} " [ DONE ]"
- @${ECHO_MSG} -n ">> Installing examples in ${EXAMPLESDIR}/..."
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+ @${ECHO_MSG} -n ">> Installing examples in ${STAGEDIR}${EXAMPLESDIR}/..."
@cd ${WRKSRC}/examples \
- && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \
- && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \;
+ && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/{} \; \
+ && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;
@${ECHO_MSG} " [ DONE ]"
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
post-install:
@${FIND} -s ${WRKSRC}/examples -not -type d \
- | ${SED} -ne 's,^${WRKSRC}/examples,${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+ | ${SED} -ne 's,^${WRKSRC}/examples,${STAGEDIR}${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
@${FIND} -s -d ${WRKSRC}/examples -type d \
- | ${SED} -ne 's,^${WRKSRC}/examples,@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+ | ${SED} -ne 's,^${WRKSRC}/examples,@dirrm ${STAGEDIR}${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
.endif
.include <bsd.port.mk>
diff -ruN /usr/ports/devel/log4j/distinfo ./log4j/distinfo
--- /usr/ports/devel/log4j/distinfo 2014-01-22 18:34:18.000000000 +0100
+++ ./log4j/distinfo 2014-02-02 17:46:54.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (apache-log4j-1.2.16.tar.gz) = 3a93ef38eb7ac9f851626d8b27cde7db1bfc78c1b587520fd740a0ab03e44c89
-SIZE (apache-log4j-1.2.16.tar.gz) = 2791979
+SHA256 (log4j-1.2.17.tar.gz) = a528e3771ee6234661b5eb0fa02e14faee89dfec38de94088c163ddf2a0a8663
+SIZE (log4j-1.2.17.tar.gz) = 2864448
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402021940.s12Jec0u080662>