svn commit: r347262 - head/devel/log4j

[Pawel Pekala]

Author: pawel
Date: Thu Mar  6 15:48:06 2014
New Revision: 347262
URL: http://svnweb.freebsd.org/changeset/ports/347262
QAT: https://qat.redports.org/buildarchive/r347262/

Log:
  - Update to version 1.2.17 [1]
  - Convert to new options framework [1]
  - Add LICENSE [1]
  - Support staging [1]
  - Remove leading article from COMMENT
  - Use PORTEXAMPLES to manage examples plist entries
  
  PR:		ports/186388 [1]
  Submitted by:	Hardy Schumacher <hardy.schumacher at gmx.de>

Modified:
  head/devel/log4j/Makefile
  head/devel/log4j/distinfo

Modified: head/devel/log4j/Makefile
==============================================================================
--- head/devel/log4j/Makefile	Thu Mar  6 15:46:24 2014	(r347261)
+++ head/devel/log4j/Makefile	Thu Mar  6 15:48:06 2014	(r347262)
@@ -2,48 +2,40 @@
 # $FreeBSD$
 
 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=	ports at FreeBSD.org
-COMMENT=	A fast and flexible logging library for Java
+COMMENT=	Fast and flexible logging library for Java
+
+LICENSE=	APACHE20
 
 USE_JAVA=	YES
 NO_BUILD=	YES
 
-PLIST_FILES=	%%JAVAJARDIR%%/log4j.jar
+WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.if !defined(NOPORTDOCS)
+PLIST_FILES=	%%JAVAJARDIR%%/log4j.jar
 PORTDOCS=	*
-.endif
+PORTEXAMPLES=	*
 
-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}/..."
+	@${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}/..."
+	@${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)
-post-install:
-	@${FIND} -s ${WRKSRC}/examples -not -type d \
-	  | ${SED} -ne 's,^${WRKSRC}/examples,${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -s -d ${WRKSRC}/examples -type d \
-	  | ${SED} -ne 's,^${WRKSRC}/examples, at dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-.endif
 
 .include <bsd.port.mk>

Modified: head/devel/log4j/distinfo
==============================================================================
--- head/devel/log4j/distinfo	Thu Mar  6 15:46:24 2014	(r347261)
+++ head/devel/log4j/distinfo	Thu Mar  6 15:48:06 2014	(r347262)
@@ -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