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

[ctriv at midnightbsd.org]

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

Modified Files:
--------------
    mports/graphics/poppler:
        Makefile (r1.6 -> r1.7)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/poppler/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L graphics/poppler/Makefile -L graphics/poppler/Makefile -u -r1.6 -r1.7
--- graphics/poppler/Makefile
+++ graphics/poppler/Makefile
@@ -33,7 +33,7 @@
 OPTIONS=	CAIRO "Enable cairo output backend" on
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
 .if defined(SLAVEPORT)
 LIB_DEPENDS+=	poppler.2:${PORTSDIR}/graphics/poppler
@@ -51,8 +51,6 @@
 USE_QT_VER+=	3
 BUILD_WRKSRC=	${WRKSRC}/qt
 INSTALL_WRKSRC=	${WRKSRC}/qt
-# blah.. USE_QT_VER can't be defined after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.kde.mk"
 .else
 CONFIGURE_ARGS+=--disable-poppler-qt
 .endif
@@ -88,6 +86,8 @@
 .endif
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt"
 	@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${PREFIX}/include|; \