[Midnightbsd-cvs] mports: bsd.mport.mk: Use the new extension loading stuff.
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Tue Oct 28 18:43:09 EDT 2008
Log Message:
-----------
Use the new extension loading stuff. This should be backwards compatable,
but regressions are certainly possible. All extensions are in extensions/
now, and all components in components/
Modified Files:
--------------
mports/Mk:
bsd.mport.mk (r1.123 -> r1.124)
-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.123
retrieving revision 1.124
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.123 -r1.124
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -1057,7 +1057,7 @@
TARGETDIR:= ${DESTDIR}${PREFIX}
-.include "${PORTSDIR}/Mk/mport.inc/commands.mk"
+.include "${PORTSDIR}/Mk/components/commands.mk"
# Look for ${WRKSRC}/.../*.orig files, and (re-)create
# ${FILEDIR}/patch-* files from them.
@@ -1251,9 +1251,9 @@
.endif
.if defined(PORTVERSION)
-.if ${PORTVERSION:M*[-_,]*}x != x
+. if ${PORTVERSION:M*[-_,]*}x != x
IGNORE= PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','
-.endif
+. endif
DISTVERSION?= ${PORTVERSION:S/:/::/g}
.elif defined(DISTVERSION)
PORTVERSION= ${DISTVERSION:L:C/([a-z])[a-z]+/\1/g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
@@ -1272,20 +1272,74 @@
# check for old, crufty, makefile types, part 2. The "else" case
# should have been handled in part 1, above.
PKGVERSION?= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2}
-PKGBASE?= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+PKGBASE?= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
PKGSUBNAME= ${PKGBASE}
PKGNAME?= ${PKGBASE}-${PKGVERSION}
DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
-.if defined(USE_LINUX_RPM)
-.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
+
+PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg
+
+#
+# Handle the backwards compatibility stuff for extension loading
+#
+.if defined(XORG_CAT)
+_LOAD_XORG_EXT= yes
+.endif
+
+.if defined(PERL_CONFIGURE) || defined(PERL_MODBUILD)
+_LOAD_PERL_EXT= yes
+.endif
+
+.if defined(USE_LIBRUBY)
+_LOAD_RUBY_EXT= yes
+.endif
+
+.if defined(USE_TK)
+_LOAD_TCL_EXT= yes
+.endif
+
+.if defined(APACHE_COMPAT)
+_LOAD_APACHE_EXT= yes
.endif
-.if defined(USE_XORG) || defined(XORG_CAT)
-.include "${PORTSDIR}/Mk/bsd.xorg.mk"
+.if (defined(USE_QT_VER) && ${USE_QT_VER:L} == 3) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
+_LOAD_KDE_EXT= yes
.endif
+.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
+_LOAD_QT_EXT= yes
+.endif
+
+.if defined(USE_GTK)
+_LOAD_GNOME_EXT= yes
+.endif
+
+.if defined(USE_GSTREAMER80)
+_LOAD_GSTREAMER_EXT= yes
+.endif
+
+.if defined(KDE4_BUILDENV)
+_LOAD_KDE4_EXT= yes
+.endif
+
+
+# This is the order that we used before the extensions where refactored.
+# in the future if things could be fixed to work when loaded alphabetacally, then
+# we could go back to the above approach.
+_ALL_EXT= linux_rpm xorg gcc local perl openssl emacs gnustep php python java ruby \
+ tcl apache kde qt gnome lua wx gstreamer sdl xfce kde4 cmake mysql pgsql \
+ bdb sqlite gecko scons autotools
+
+.for EXT in ${_ALL_EXT:U}
+. if defined(USE_${EXT}) || defined(USE_${EXT}_RUN) || defined(USE_${EXT}_BUILD) || defined(WANT_${EXT}) || defined(_LOAD_${EXT}_EXT)
+. include "${PORTSDIR}/Mk/extensions/${EXT:L}.mk"
+. endif
+.endfor
+
+
+
.if defined(USE_GCPIO)
EXTRACT_DEPENDS+= gcpio:${PORTSDIR}/archivers/gcpio
.endif
@@ -1338,93 +1392,6 @@
LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG} -R
.endif
-PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg
-
-
-.if defined(USE_LOCAL_MK)
-.include "${PORTSDIR}/Mk/bsd.local.mk"
-.endif
-
-.if defined(USE_PERL5) || defined(PERL_CONFIGURE) || defined(PERL_MODBUILD) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN)
-.include "${PORTSDIR}/Mk/bsd.perl.mk"
-.endif
-
-.if defined(USE_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-.endif
-
-
-.if defined(USE_EMACS)
-.include "${PORTSDIR}/Mk/bsd.emacs.mk"
-.endif
-
-.if defined(USE_GNUSTEP)
-.include "${PORTSDIR}/Mk/bsd.gnustep.mk"
-.endif
-
-.if defined(USE_PHP)
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-.endif
-
-.if defined(USE_PYTHON) || defined(USE_PYTHON_BUILD) || defined(USE_PYTHON_RUN)
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-.endif
-
-.if defined(USE_JAVA)
-.include "${PORTSDIR}/Mk/bsd.java.mk"
-.endif
-
-.if defined(USE_RUBY) || defined(USE_LIBRUBY)
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.endif
-
-.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TK)
-.include "${PORTSDIR}/Mk/bsd.tcl.mk"
-.endif
-
-.if defined(USE_APACHE) || defined(APACHE_COMPAT)
-.include "${PORTSDIR}/Mk/bsd.apache.mk"
-.endif
-
-.if (defined(USE_QT_VER) && ${USE_QT_VER:L} == 3) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
-.include "${PORTSDIR}/Mk/bsd.kde.mk"
-.endif
-
-.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
-.include "${PORTSDIR}/Mk/bsd.qt.mk"
-.endif
-
-.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK)
-.include "${PORTSDIR}/Mk/bsd.gnome.mk"
-.endif
-
-.if defined(WANT_LUA) || defined(USE_LUA) || defined(USE_LUA_NOT)
-.include "${PORTSDIR}/Mk/bsd.lua.mk"
-.endif
-
-.if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT)
-.include "${PORTSDIR}/Mk/bsd.wx.mk"
-.endif
-
-.if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER80)
-.include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
-.endif
-
-.if defined(USE_SDL) || defined(WANT_SDL)
-.include "${PORTSDIR}/Mk/bsd.sdl.mk"
-.endif
-
-.if defined(USE_XFCE)
-.include "${PORTSDIR}/Mk/bsd.xfce.mk"
-.endif
-
-.if defined(USE_KDE4) || defined(KDE4_BUILDENV)
-.include "${PORTSDIR}/Mk/bsd.kde4.mk"
-.endif
-
-.if defined(USE_CMAKE)
-.include "${PORTSDIR}/Mk/bsd.cmake.mk"
-.endif
# These do some path checks if DESTDIR is set correctly.
# You can force skipping these test by defining IGNORE_PATH_CHECKS
@@ -1527,7 +1494,7 @@
#
# Pull in our mixins.
#
-.include "${PORTSDIR}/Mk/mport.inc/metadata.mk"
+.include "${PORTSDIR}/Mk/components/metadata.mk"
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
.if defined(NO_WRKSUBDIR)
@@ -1627,10 +1594,6 @@
_MAKE_CMD= ${GMAKE}
.endif
-.if defined(USE_GCC)
-.include "${PORTSDIR}/Mk/bsd.gcc.mk"
-.endif
-
.if defined(USE_OPENLDAP_VER)
USE_OPENLDAP?= yes
WANT_OPENLDAP_VER= ${USE_OPENLDAP_VER}
@@ -1875,87 +1838,16 @@
.endif
-.if defined(USE_LOCAL_MK)
-.include "${PORTSDIR}/Mk/bsd.local.mk"
-.endif
-
-.if defined(USE_XORG) || defined(XORG_CAT)
-.include "${PORTSDIR}/Mk/bsd.xorg.mk"
-.endif
-
-.if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \
- defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \
- defined(USE_BDB) || defined(USE_SQLITE)
-.include "${PORTSDIR}/Mk/bsd.database.mk"
-.endif
-
-.if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER80)
-.include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
-.endif
-
-.if defined(USE_PERL5) || defined(PERL_CONFIGURE) || defined(PERL_MODBUILD) || defined(USE_PERL5_BUILD) || defined(USE_PERL5_RUN)
-.include "${PORTSDIR}/Mk/bsd.perl.mk"
-.endif
-
-.if defined(USE_GECKO)
-.include "${PORTSDIR}/Mk/bsd.gecko.mk"
-.endif
-
-.if defined(USE_GNUSTEP)
-.include "${PORTSDIR}/Mk/bsd.gnustep.mk"
-.endif
-
-.if defined(USE_JAVA)
-.include "${PORTSDIR}/Mk/bsd.java.mk"
-.endif
-
-.if defined(USE_LINUX_RPM)
-.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
-.endif
-
-.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
-.include "${PORTSDIR}/Mk/bsd.qt.mk"
-.endif
-
-.if defined(USE_SCONS)
-.include "${PORTSDIR}/Mk/bsd.scons.mk"
-.endif
-
-.if defined(USE_SDL) || defined(WANT_SDL)
-.include "${PORTSDIR}/Mk/bsd.sdl.mk"
-.endif
-
-.if defined(USE_PYTHON)
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-.endif
-
-.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TK)
-.include "${PORTSDIR}/Mk/bsd.tcl.mk"
-.endif
-
-.if defined(USE_LUA) || defined(USE_LUA_NOT)
-.include "${PORTSDIR}/Mk/bsd.lua.mk"
-.endif
-
-.if defined(USE_WX) || defined(USE_WX_NOT)
-.include "${PORTSDIR}/Mk/bsd.wx.mk"
-.endif
-
-.if defined(USE_APACHE) || defined(APACHE_COMPAT)
-.include "${PORTSDIR}/Mk/bsd.apache.mk"
-.endif
-
-.if defined(USE_AUTOTOOLS)
-.include "${PORTSDIR}/Mk/bsd.autotools.mk"
-.endif
+#
+# Here we include again XXX
+#
+.for EXT in ${_ALL_EXT:U}
+. if defined(USE_${EXT}) || defined(USE_${EXT}_RUN) || defined(USE_${EXT}_BUILD) || defined(WANT_${EXT}) || defined(_LOAD_${EXT}_EXT)
+. include "${PORTSDIR}/Mk/extensions/${EXT:L}.mk"
+. endif
+.endfor
-.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK)
-.include "${PORTSDIR}/Mk/bsd.gnome.mk"
-.endif
-.if defined(USE_XFCE)
-.include "${PORTSDIR}/Mk/bsd.xfce.mk"
-.endif
.if exists(${PORTSDIR}/../Makefile.inc)
.include "${PORTSDIR}/../Makefile.inc"
@@ -2232,7 +2124,7 @@
.if !defined(USE_MPORT_TOOLS)
-.include "${PORTSDIR}/Mk/bsd.pkg_tools.mk"
+.include "${PORTSDIR}/Mk/components/old_pkg_tools.mk"
.endif
@@ -2289,7 +2181,7 @@
.endif
# Popular master sites
-.include "bsd.sites.mk"
+.include "${PORTSDIR}/Mk/components/sites.mk"
# Empty declaration to avoid "variable MASTER_SITES recursive" error
MASTER_SITES?=
More information about the Midnightbsd-cvs
mailing list