[Midnightbsd-cvs] mports [20160] trunk/java/openjdk7/Makefile: move iconv lib test to after bsd.port.pre.mk so its not always empty

[laffer1 at midnightbsd.org]

Revision: 20160
          http://svnweb.midnightbsd.org/mports/?rev=20160
Author:   laffer1
Date:     2015-09-01 08:40:53 -0400 (Tue, 01 Sep 2015)
Log Message:
-----------
move iconv lib test to after bsd.port.pre.mk so its not always empty

Modified Paths:
--------------
    trunk/java/openjdk7/Makefile

Modified: trunk/java/openjdk7/Makefile
===================================================================
--- trunk/java/openjdk7/Makefile	2015-08-31 22:07:33 UTC (rev 20159)
+++ trunk/java/openjdk7/Makefile	2015-09-01 12:40:53 UTC (rev 20160)
@@ -2,7 +2,7 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
 		http://download.java.net/jaxp/1.4.5/:jaxp \
@@ -114,10 +114,6 @@
 
 .include <bsd.mport.options.mk>
 
-.if empty(ICONV_LIB)
-MAKE_ENV+=	EXTRA_CFLAGS=-DLIBICONV_PLUG
-.endif
-
 .if empty(PORT_OPTIONS:MDEBUG)
 MAKE_ENV+=	ALT_OBJCOPY="/nonexistent"
 .endif
@@ -144,6 +140,12 @@
 PATCH=		gpatch
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+MAKE_ENV+=      EXTRA_CFLAGS=-DLIBICONV_PLUG
+.endif
+
 post-extract: dos2unix
 	# Move icons to their new home.
 	@${MKDIR} ${WRKSRC}/jdk/src/share/classes/sun/awt/resources
@@ -196,4 +198,4 @@
 		${SED} -e 's,^${PREFIX}/, at dirrm ,' >> ${TMPPLIST}
 	@${ECHO} "@exec ${LOCALBASE}/bin/registervm '${TRUE_PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}/bin/java # OpenJDK${JDK_MAJOR_VERSION}'" >> ${TMPPLIST}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>