From owner-svn-ports-head@FreeBSD.ORG  Tue Mar 12 10:39:31 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id AEABCE63;
 Tue, 12 Mar 2013 10:39:31 +0000 (UTC) (envelope-from ale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A0FC29E6;
 Tue, 12 Mar 2013 10:39:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CAdVu1038387;
 Tue, 12 Mar 2013 10:39:31 GMT (envelope-from ale@svn.freebsd.org)
Received: (from ale@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2CAdVva038386;
 Tue, 12 Mar 2013 10:39:31 GMT (envelope-from ale@svn.freebsd.org)
Message-Id: <201303121039.r2CAdVva038386@svn.freebsd.org>
From: Alex Dupre <ale@FreeBSD.org>
Date: Tue, 12 Mar 2013 10:39:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313961 - head/java/jakarta-commons-httpclient
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Mar 2013 10:39:31 -0000

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@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 \