ports/184204: commit references a PR

[dfilter service]

The following reply was made to PR ports/184204; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/184204: commit references a PR
Date: Wed,  5 Mar 2014 20:59:58 +0000 (UTC)

 Author: tijl
 Date: Wed Mar  5 20:59:50 2014
 New Revision: 347142
 URL: http://svnweb.freebsd.org/changeset/ports/347142
 QAT: https://qat.redports.org/buildarchive/r347142/
 
 Log:
   - Include bsd.port.pre.mk before testing if ICONV_LIB is empty.  It is
     always empty without this. [1]
   - Add -DLIBICONV_PLUG to CFLAGS to enforce the use of libc iconv even when
     libiconv is installed. [2]
   
   PR:		ports/184204 [1], ports/184782 [1], ports/186956 [2]
   Approved by:	glewis (maintainer)
 
 Modified:
   head/java/openjdk7/Makefile
 
 Modified: head/java/openjdk7/Makefile
 ==============================================================================
 --- head/java/openjdk7/Makefile	Wed Mar  5 20:31:02 2014	(r347141)
 +++ head/java/openjdk7/Makefile	Wed Mar  5 20:59:50 2014	(r347142)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	openjdk
  PORTVERSION=	${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
 -PORTREVISION=	1
 +PORTREVISION=	2
  PORTEPOCH=	1
  CATEGORIES=	java devel
  MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
 @@ -138,6 +138,12 @@ PATCH_DEPENDS+=	gpatch:${PORTSDIR}/devel
  PATCH=		gpatch
  .endif
  
 +.include <bsd.port.pre.mk>
 +
 +.if empty(ICONV_LIB)
 +MAKE_ENV+=	EXTRA_CFLAGS=-DLIBICONV_PLUG
 +.endif
 +
  post-patch:
  	@${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \
  		${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp
 @@ -180,4 +186,4 @@ post-install:
  	# Register the VM
  	"${LOCALBASE}/bin/registervm" "${INSTALLDIR}/bin/java # OpenJDK${JDK_MAJOR_VERSION}"
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"