ports/110066: [patch] TK/ICONV/XPM config knobs for ports/graphics/graphviz

[Helge Oldach]

>Number:         110066
>Category:       ports
>Synopsis:       [patch] TK/ICONV/XPM config knobs for ports/graphics/graphviz
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 08 06:40:09 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Helge Oldach
>Release:        FreeBSD 6.2-740 i386
>Organization:
>Environment:

System: FreeBSD localhost 6.2-740 FreeBSD 6.2-740 #0: Thu Mar 1 10:40:54 CET 2007 toor at localhost:/usr/obj/usr/src/sys/HMO i386

>Description:

The patch below adds three more "make config" knobs for
ports/graphics/graphviz. All OPTIONs are default "on" to maintain
backward compatibility.

TK	- dependency on TK
ICONV	- dependency on ICONV
XPM	- dependency on XPM

Note that using these knobs will disable some graphviz functionality.
This is intended for users who just need to create graphviz files on the
fly, for example on webservers without X11.

The patch appears rather large, but is essentially just a restructuring
of the Makefile without new functionality (apart from three new OPTIONs
and related conditional Makefile evaluation).

>How-To-Repeat:

>Fix:

--- Makefile.ORIG	Thu Mar  8 07:29:28 2007
+++ Makefile	Thu Mar  8 07:26:50 2007
@@ -21,11 +21,8 @@
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		gd.4:${PORTSDIR}/graphics/gd
 
-USE_TK=		84
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_XPM=	yes
 USE_AUTOTOOLS=	libltdl:15 libtool:15
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
@@ -37,24 +34,22 @@
 		dotty.1 gc.1 gvcolor.1 gvpack.1 gvpr.1 gxl2dot.1 lefty.1 \
 		lneato.1 nop.1 prune.1 sccmap.1 tred.1 unflatten.1
 MAN3=		agraph.3 cdt.3 expr.3 graph.3 gvc.3 pathplan.3
-MANN=		gdtclft.n tcldot.n tkspline.n
 MLINKS=		dot.1 circo.1 \
 		gxl2dot.1 dot2gxl.1 \
 		dot.1 fdp.1 \
 		dot.1 neato.1 \
 		dot.1 twopi.1
 
-PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted \
-			tclpkg/tclpathplan/demo/pathplan tclpkg/tkspline/demo/spline
-PATCH_TK_SCRIPTS=	${PATCH_TCL_SCRIPTS}
-
 PDOCS_TXT=	AUTHORS NEWS ChangeLog cpl1.0.txt doc/Dot.ref doc/latex_suggestions.txt
 PDOCS_PDF=	doc/*.pdf */*/*.pdf
 PDOCS_HTML=	doc/*.html doc/info/*.html doc/info/*.gif
 
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
-OPTIONS=	PANGOCAIRO "build with pangocairo support (gtk)" off \
+OPTIONS=	TK "Build with TK support" on \
+		XPM "Build with XPM support" on \
+		ICONV "Build with ICONV support" on \
+		PANGOCAIRO "build with pangocairo support (gtk)" off \
 		PERL "Perl bindings (swig)" off \
 		PHP "PHP bindings (swig)" off \
 		PYTHON "Python bindings (swig)" off \
@@ -67,10 +62,7 @@
 
 CONFIGURE_ARGS=	--program-transform-name="s/x/x/" \
 		--enable-dependency-tracking \
-		--with-iconvlibdir=${LOCALBASE}/lib \
 		--with-libgd \
-		--with-tclsh=${TCLSH} \
-		--with-wish=${WISH} \
 		--with-fontconfigincludedir=${X11BASE}/include \
 		--with-fontconfiglibdir=${X11BASE}/lib \
 		--disable-io --disable-ocaml --disable-java \
@@ -79,10 +71,30 @@
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh" \
-		TKCONFIG="${TK_LIBDIR}/tkConfig.sh" \
 		MISSING=${TRUE}
 
+.if defined(WITH_TK)
+USE_TK=		84
+PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted \
+			tclpkg/tclpathplan/demo/pathplan tclpkg/tkspline/demo/spline
+PATCH_TK_SCRIPTS=	${PATCH_TCL_SCRIPTS}
+.include "${PORTSDIR}/Mk/bsd.tcl.mk"
+CONFIGURE_ARGS+=	--with-tclsh=${TCLSH} \
+		--with-wish=${WISH}
+CONFIGURE_ENV+=	TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh" \
+		TKCONFIG="${TK_LIBDIR}/tkConfig.sh"
+MANN=		gdtclft.n tcldot.n tkspline.n
+.endif
+
+.if defined(WITH_ICONV)
+USE_ICONV=	yes
+CONFIGURE_ARGS+=	--with-iconvlibdir=${LOCALBASE}/lib
+.endif
+
+.if defined(WITH_XPM)
+USE_XPM=	yes
+.endif
+
 .if !defined(WITH_PANGOCAIRO)
 CONFIGURE_ARGS+=	--with-pangocairo=no
 PLIST_SUB+=		WITH_PANGOCAIRO="@comment "
@@ -197,12 +209,14 @@
 	@${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \
 		-e "s|-lruby|-lruby${RUBY_SUFFIX}|g" ${WRKSRC}/configure
 
+.if defined(WITH_TK)
 post-install-script:
 	${INSTALL_MAN} \
 		${WRKSRC}/tclpkg/gdtclft/gdtclft.n \
 		${WRKSRC}/tclpkg/tcldot/tcldot.n \
 		${WRKSRC}/tclpkg/tkspline/tkspline.n \
 		${MANNPREFIX}/man/mann/
+.endif
 
 post-install: install-ldconfig-file
 .if !defined(NOPORTDOCS)

>Release-Note:
>Audit-Trail:
>Unformatted: