svn commit: r313961 - head/java/jakarta-commons-httpclient

[Alex Dupre]

Author: ale
Date: Tue Mar 12 10:39:30 2013
New Revision: 313961
URL: http://svnweb.freebsd.org/changeset/ports/313961

Log:
  Revert last commits and restore previous working fix [1].
  Switch to OptionsNG.
  
  PR:		ports/176795 [1]
  Submitted by:	Eric Krausser <eric at krausser-edv.de>

Modified:
  head/java/jakarta-commons-httpclient/Makefile

Modified: head/java/jakarta-commons-httpclient/Makefile
==============================================================================
--- head/java/jakarta-commons-httpclient/Makefile	Tue Mar 12 10:35:16 2013	(r313960)
+++ head/java/jakarta-commons-httpclient/Makefile	Tue Mar 12 10:39:30 2013	(r313961)
@@ -23,7 +23,7 @@ RUN_DEPENDS+=	${JAVAJARDIR}/commons-code
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
-MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES LANG=C LC_ALL=C
+MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 ALL_TARGET=	dist
@@ -32,11 +32,18 @@ PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.
 
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
+post-patch:
+	@LANG=C ${REINPLACE_CMD} 's/Ortwin Gl.*ck/Ortwin Glueck/' \
+		${WRKSRC}/src/java/org/apache/commons/httpclient/*.java \
+		${WRKSRC}/src/java/org/apache/commons/httpclient/*/*.java
+
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..."
 	@${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}.jar ${JAVAJARDIR}/
 	@${ECHO_MSG} " [DONE]"
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing documentation..."
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/dist/docs && ${FIND} api \