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

ctriv at midnightbsd.org ctriv at midnightbsd.org
Fri Nov 7 13:20:26 EST 2008


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

Modified Files:
--------------
    mports/x11-wm/compiz:
        Makefile (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-wm/compiz/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11-wm/compiz/Makefile -L x11-wm/compiz/Makefile -u -r1.4 -r1.5
--- x11-wm/compiz/Makefile
+++ x11-wm/compiz/Makefile
@@ -76,7 +76,7 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
 .if !defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--enable-librsvg
@@ -149,11 +149,10 @@
 USE_KDEBASE_VER=	3
 CONFIGURE_ARGS+=	--enable-kde
 PLIST_SUB+=	KDE=""
-# allow bsd.kde.mk to be included after bsd.port.mk
-.include "${PORTSDIR}/Mk/bsd.kde.mk"
 .else
 CONFIGURE_ARGS+=	--disable-kde
 PLIST_SUB+=	KDE="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
 .include <bsd.port.post.mk>


More information about the Midnightbsd-cvs mailing list