[Midnightbsd-cvs] mports: Makefile: always use libiconv and replace it so we can avoid the

[laffer1 at midnightbsd.org]

Log Message:
-----------
always use libiconv and replace it so we can avoid the autogen script (i hope)

Modified Files:
--------------
    mports/graphics/graphviz:
        Makefile (r1.5 -> r1.6)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/graphviz/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L graphics/graphviz/Makefile -L graphics/graphviz/Makefile -u -r1.5 -r1.6
--- graphics/graphviz/Makefile
+++ graphics/graphviz/Makefile
@@ -67,7 +67,7 @@
 PDOCS_PDF=	doc/*.pdf */*/*.pdf
 PDOCS_HTML=	doc/*.html doc/info/*.html doc/info/*.gif
 
-OPTIONS=	ICONV "Build with ICONV support" on \
+OPTIONS=	\
 		XPM "Build with XPM support" on \
 		DIGCOLA "DIGCOLA features in neato layout engine" on \
 		IPSEPCOLA "IPSEPCOLA features in neato layout engine" on \
@@ -129,13 +129,9 @@
 PLIST_SUB+=		TCL_VER="${TCL_VER}"
 .endif
 
-.if defined(WITHOUT_ICONV)
-CONFIGURE_ARGS+=	--without-libiconv-prefix
-.else
 USE_ICONV=		yes
 CONFIGURE_ARGS+=	--with-iconvlibdir=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-iconvincludedir=${LOCALBASE}/include
-.endif
 
 .if !defined(WITHOUT_XPM) || exists(${LOCALBASE}/lib/libXpm.so)
 USE_XORG+=		xaw8 xpm xmu xt sm ice xext x11 xau xdmcp xp
@@ -383,6 +379,7 @@
 		-e "s|\([^:]*:.*\) install-demoDATA\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-demoSCRIPTS\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-pathplanexampleDATA\(.*\)|\1\2|g" \
+		-e "s|@LIBICONV@|-liconv|g" \
 		-e 's|demodir = $$(pkgdatadir)/demo|demodir = ${EXAMPLESDIR}|';
 	@${REINPLACE_CMD} \
 		-e 's|^\.SUFFIXES: \(.*\)\.1\(.*\)|.SUFFIXES: \1 \2|' \