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

ctriv at midnightbsd.org ctriv at midnightbsd.org
Fri Nov 7 12:23:09 EST 2008


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

Modified Files:
--------------
    mports/irc/xchat:
        Makefile (r1.6 -> r1.7)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/irc/xchat/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L irc/xchat/Makefile -L irc/xchat/Makefile -u -r1.6 -r1.7
--- irc/xchat/Makefile
+++ irc/xchat/Makefile
@@ -39,7 +39,7 @@
 		TCL "Enable TCL support" off \
 		SOCKS "Build with socks5 support" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
 .if !defined(WITHOUT_DBUS)
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
@@ -88,7 +88,6 @@
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=	yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 CONFIGURE_ARGS+=--enable-python
 PLIST_SUB+=	PYTHON=""
 .else
@@ -114,6 +113,9 @@
 CONFIGURE_ARGS+=--enable-socks
 .endif
 
+
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \
 		${WRKSRC}/configure


More information about the Midnightbsd-cvs mailing list