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

[ctriv at midnightbsd.org]

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

Modified Files:
--------------
    mports/databases/rrdtool:
        Makefile (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/rrdtool/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/rrdtool/Makefile -L databases/rrdtool/Makefile -u -r1.1 -r1.2
--- databases/rrdtool/Makefile
+++ databases/rrdtool/Makefile
@@ -30,10 +30,10 @@
 		RUBY_MODULE	"Build RUBY bindings" off \
 		PERL_MODULE	"Build PERL module" on
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
+
 .if defined(WITH_PYTHON_MODULE)
 USE_PYTHON=	yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 PLIST_SUB+=	WITH_PYTHON=""
 CONFIGURE_ARGS+=	--enable-python
 .else
@@ -43,7 +43,6 @@
 
 .if defined(WITH_RUBY_MODULE)
 USE_RUBY=	yes
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 PLIST_SUB+=	WITH_RUBY=""
 CONFIGURE_ARGS+=	--enable-ruby
 .else
@@ -60,6 +59,8 @@
 PLIST_SUB+=	WITH_PERL="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd6.0
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype2
 LDFLAGS+=	-L${LOCALBASE}/lib