[Midnightbsd-cvs] mports [16393] trunk/converters/libiconv/Makefile: fixup

[laffer1 at midnightbsd.org]

Revision: 16393
          http://svnweb.midnightbsd.org/mports/?rev=16393
Author:   laffer1
Date:     2014-06-15 14:03:41 -0400 (Sun, 15 Jun 2014)
Log Message:
-----------
fixup

Modified Paths:
--------------
    trunk/converters/libiconv/Makefile

Modified: trunk/converters/libiconv/Makefile
===================================================================
--- trunk/converters/libiconv/Makefile	2014-06-15 18:00:16 UTC (rev 16392)
+++ trunk/converters/libiconv/Makefile	2014-06-15 18:03:41 UTC (rev 16393)
@@ -2,28 +2,26 @@
 
 PORTNAME=	libiconv
 PORTVERSION=	1.14
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	converters devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A character set conversion library
+COMMENT=	Character set conversion library
 
 LICENSE=	lgpl
 
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-LIBTOOLFILES=	configure libcharset/configure preload/configure
 CONFIGURE_ARGS=	--enable-static \
 		--without-libintl-prefix \
 		--docdir=${DOCSDIR}
-USE_LDCONFIG=	yes
-CONFIGURE_ENV=	gl_cv_cc_visibility="no" \
-		am_cv_func_iconv="yes" \
+CONFIGURE_ENV=	am_cv_func_iconv="yes" \
 		am_cv_proto_iconv_arg1="const"
 MAKE_JOBS_UNSAFE=	yes
+USE_CSTD=	gnu89
+USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	ENCODINGS PATCHES
+OPTIONS_DEFINE=	DOCS ENCODINGS PATCHES
 OPTIONS_DEFAULT=ENCODINGS
 ENCODINGS_DESC=	Include extra character sets
 PATCHES_DESC=	Apply patches to fix CP932, add EUCJP-MS
@@ -48,11 +46,4 @@
 		${WRKSRC}/libcharset/configure \
 		${WRKSRC}/preload/configure
 
-.include <bsd.port.pre.mk>
-
-.if exists(/usr/include/iconv.h) && ${OSVERSION} > 6000
-IGNORE=		converters/libiconv should not be used with iconv from base. \
-Please fix the port which tries to use it
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>