[Midnightbsd-cvs] mports: Makefile: use bsd.mport.options.mk

[ctriv at midnightbsd.org]

Log Message:
-----------
use bsd.mport.options.mk

Modified Files:
--------------
    mports/graphics/graphviz:
        Makefile (r1.9 -> r1.10)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/graphviz/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -L graphics/graphviz/Makefile -L graphics/graphviz/Makefile -u -r1.9 -r1.10
--- graphics/graphviz/Makefile
+++ graphics/graphviz/Makefile
@@ -89,7 +89,7 @@
 		TCL "TCL bindings (swig)" off \
 		GUILE "Guile bindings (swig)" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd6.0 \
 			--host=${ARCH}-portbld-freebsd6.0 \
@@ -123,7 +123,6 @@
 .if defined(WITH_TCL) || defined(WITH_TK)
 CPPFLAGS+=		-I${TCL_INCLUDEDIR}
 USE_TCL_BUILD=		84+
-.include "${PORTSDIR}/Mk/bsd.tcl.mk"
 CONFIGURE_ARGS+=	--with-tclsh=${TCLSH}
 CONFIGURE_ENV+=		TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh"
 MANN+=			gdtclft.n tcldot.n
@@ -134,7 +133,7 @@
 CONFIGURE_ARGS+=	--with-iconvlibdir=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-iconvincludedir=${LOCALBASE}/include
 
-.if !defined(WITHOUT_XPM) || exists(${LOCALBASE}/lib/libXpm.so)
+.if !defined(WITHOUT_XPM) || (!defined(PACKAGE_BUILDING) && exists(${LOCALBASE}/lib/libXpm.so))
 USE_XORG+=		xaw8 xpm xmu xt sm ice xext x11 xau xdmcp xp
 MAN1+=			lefty.1
 PLIST_SUB+=		WITH_XPM=""
@@ -212,12 +211,6 @@
 CONFIGURE_ARGS+=	--without-glade
 .endif
 
-.if defined(USE_GNOME)
-.include "${PORTSDIR}/Mk/bsd.gnome.mk"
-.endif
-.if defined(USE_XORG)
-.include "${PORTSDIR}/Mk/bsd.xorg.mk"
-.endif
 
 .if defined(WITH_SMYRNA)
 CONFIGURE_ARGS+=	 --with-gtkgl=yes
@@ -318,7 +311,6 @@
 CONFIGURE_ARGS+=	--enable-python
 PLIST_SUB+=		WITH_PYTHON=""
 USE_PYTHON_BUILD=	yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 LDFLAGS+=		"-L${PYTHON_LIBDIR}"
 MANN+=			gv_python.n
 .else
@@ -330,7 +322,6 @@
 CONFIGURE_ARGS+=	--enable-ruby
 PLIST_SUB+=		WITH_RUBY=""
 USE_RUBY=		yes
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 MANN+=			gv_ruby.n
 .else
 CONFIGURE_ARGS+=	--disable-ruby
@@ -341,7 +332,6 @@
 CONFIGURE_ARGS+=	--enable-lua
 PLIST_SUB+=		WITH_LUA=""
 USE_LUA=		yes
-.include "${PORTSDIR}/Mk/bsd.lua.mk"
 CFLAGS+=		-I${LUA_INCDIR}
 LDFLAGS+=		-L${LUA_LIBDIR} -lm
 CONFIGURE_ENV+=		LUA="${LUA_BINDIR}/lua"
@@ -370,6 +360,8 @@
 PLIST_SUB+=		WITH_GUILE="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
 pre-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} \