Date: Thu, 1 Sep 2011 13:43:02 +0100 From: Chris Rees <crees@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/160361: [PATCH] exp-run: Separate includes from bsd.port.mk Message-ID: <BLU0-SMTP15000F1389DC7AD94C109EDA9190@phx.gbl> Resent-Message-ID: <201109011250.p81Co8lT096288@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160361 >Category: ports >Synopsis: [PATCH] exp-run: Separate includes from bsd.port.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Sep 01 12:50:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Chris Rees >Release: FreeBSD 8.2-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD zeus.bayofrum.net 8.2-RELEASE-p1 FreeBSD 8.2-RELEASE-p1 #0: Sat Apr 30 15:09:06 BST 2011 root@zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386 >Description: As documented in [1], bsd.port.mk's include functions using USE_ are a bit of a mess. I would like to separate them into a new file, so that they are forced to act in the same place; just at the end of bsd.port.pre.mk. If this works well, we can then look at simplifying to code for including these files, as well as imposing some order in the Mk/ hierarchy. If the exp-run goes OK, and people are happy, perhaps this could even go in... though at this stage that might be a little optimistic :) [1] http://wiki.freebsd.org/SimplifyingMkIncludes >How-To-Repeat: >Fix: New file bsd.include.mk added. --- bsd-include-mk.diff begins here --- Index: Mk/bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.692 diff -u -r1.692 bsd.port.mk --- Mk/bsd.port.mk 12 Aug 2011 16:39:23 -0000 1.692 +++ Mk/bsd.port.mk 1 Sep 2011 12:31:39 -0000 @@ -1361,24 +1361,12 @@ WWWDIR?= ${PREFIX}/www/${PORTNAME} ETCDIR?= ${PREFIX}/etc/${PORTNAME} -.if defined(USE_LINUX_RPM) -.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" -.endif - -.if defined(USE_LINUX_APPS) -.include "${PORTSDIR}/Mk/bsd.linux-apps.mk" -.endif - .if ${X11BASE} != ${LOCALBASE} .BEGIN: @${ECHO_MSG} "X11BASE is now deprecated. Unset X11BASE in make.conf and try again." @${FALSE} .endif -.if defined(USE_XORG) || defined(XORG_CAT) -.include "${PORTSDIR}/Mk/bsd.xorg.mk" -.endif - .if defined(USE_BZIP2) EXTRACT_SUFX?= .tar.bz2 .elif defined(USE_ZIP) @@ -1415,112 +1403,6 @@ .include "${PORTSDIR}/Mk/bsd.local.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 - -.include "${PORTSDIR}/Mk/bsd.perl.mk" - -.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_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART) -.include "${PORTSDIR}/Mk/bsd.efl.mk" -.endif - -.if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL) -.include "${PORTSDIR}/Mk/bsd.fpc.mk" -.endif - -.if defined(USE_JAVA) -.include "${PORTSDIR}/Mk/bsd.java.mk" -.endif - -.if defined(USE_R_MOD) -.include "${PORTSDIR}/Mk/bsd.cran.mk" -.endif - -.if defined(USE_RUBY) || defined(USE_LIBRUBY) -.include "${PORTSDIR}/Mk/bsd.ruby.mk" -.endif - -.if defined(USE_OCAML) -.include "${PORTSDIR}/Mk/bsd.ocaml.mk" -.endif - -.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || defined(USE_TK) || defined(USE_TK_BUILD) || defined(USE_TK_RUN) || defined(USE_TK_WRAPPER) -.include "${PORTSDIR}/Mk/bsd.tcl.mk" -.endif - -.if defined(USE_APACHE) || defined(USE_APACHE_BUILD) || defined(USE_APACHE_RUN) -.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(USE_DRUPAL) -.include "${PORTSDIR}/Mk/bsd.drupal.mk" -.endif - -.if defined(WANT_GECKO) || defined(USE_GECKO) || defined(USE_FIREFOX) || defined(USE_FIREFOX_BUILD) || defined(USE_SEAMONKEY) || defined(USE_SEAMONKEY_BUILD) || defined(USE_THUNDERBIRD) || defined(USE_THUNDERBIRD_BUILD) -.include "${PORTSDIR}/Mk/bsd.gecko.mk" -.endif - -.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(INSTALLS_ICONS) -.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_QMAIL) || defined(USE_QMAIL_RUN) || defined(USE_QMAIL_BUILD) || defined(WANT_QMAIL) -.include "${PORTSDIR}/Mk/bsd.mail.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_NCURSES) -.include "${PORTSDIR}/Mk/bsd.ncurses.mk" -.endif - # You can force skipping these test by defining IGNORE_PATH_CHECKS .if !defined(IGNORE_PATH_CHECKS) .if (${PREFIX:C,(^.).*,\1,} != "/") @@ -1538,6 +1420,8 @@ WWWOWN?= www WWWGRP?= www +.include "${PORTSDIR}/Mk/bsd.include.mk" + .endif # End of pre-makefile section. @@ -1679,10 +1563,6 @@ CONFIGURE_ENV+= MAKE=${GMAKE} .endif -.if defined(USE_GCC) || defined(USE_FORTRAN) -.include "${PORTSDIR}/Mk/bsd.gcc.mk" -.endif - .if defined(USE_BINUTILS) && !defined(DISABLE_BINUTILS) BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils BINUTILS?= ADDR2LINE AR AS CPPFILT GPROF LD NM OBJCOPY OBJDUMP RANLIB \ @@ -1699,10 +1579,6 @@ . endfor .endif -.if defined(USE_OPENLDAP) || defined(WANT_OPENLDAP_VER) -.include "${PORTSDIR}/Mk/bsd.ldap.mk" -.endif - .if defined(USE_OPENAL) _OPENAL_ALL= al si soft alut _OPENAL_LIBS= si soft @@ -1995,102 +1871,6 @@ .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) || defined(USE_FIREBIRD) -.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_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART) -.include "${PORTSDIR}/Mk/bsd.efl.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_LINUX_APPS) -.include "${PORTSDIR}/Mk/bsd.linux-apps.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 - -.include "${PORTSDIR}/Mk/bsd.perl.mk" - -.if defined(USE_PHP) -.include "${PORTSDIR}/Mk/bsd.php.mk" -.endif - -.if defined(USE_PYTHON) -.include "${PORTSDIR}/Mk/bsd.python.mk" -.endif - -.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TK) || defined(USE_TK_BUILD) -.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(USE_APACHE_BUILD) || defined(USE_APACHE_RUN) -.include "${PORTSDIR}/Mk/bsd.apache.mk" -.endif - -.if defined(USE_AUTOTOOLS) -.include "${PORTSDIR}/Mk/bsd.autotools.mk" -.endif - -.if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL) -.include "${PORTSDIR}/Mk/bsd.fpc.mk" -.endif - -.if defined(WANT_GECKO) || defined(USE_GECKO) -.include "${PORTSDIR}/Mk/bsd.gecko.mk" -.endif - -.if defined(WANT_GNOME) || defined(USE_GNOME) -.include "${PORTSDIR}/Mk/bsd.gnome.mk" -.endif - -.if defined(USE_XFCE) -.include "${PORTSDIR}/Mk/bsd.xfce.mk" -.endif - -.if defined(USE_KDE4) -.include "${PORTSDIR}/Mk/bsd.kde4.mk" -.endif - -.if defined(USE_CMAKE) -.include "${PORTSDIR}/Mk/bsd.cmake.mk" -.endif - .if exists(${PORTSDIR}/../Makefile.inc) .include "${PORTSDIR}/../Makefile.inc" USE_SUBMAKE= yes Index: Mk/bsd.include.mk =================================================================== RCS file: Mk/bsd.include.mk diff -N Mk/bsd.include.mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Mk/bsd.include.mk 1 Sep 2011 12:31:39 -0000 @@ -0,0 +1,238 @@ +#-*- mode: makefile; tab-width: 4; -*- +# ex:ts=4 +# +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.692 2011/08/12 16:39:23 linimon Exp $ +# +# bsd.use.mk +# This file is in the public domain. +# +# Please view me with 4 column tabs! + +# DO NOT COMMIT CHANGES TO THIS FILE BY YOURSELF, EVEN IF YOU DID NOT GET +# A RESPONSE FROM THE MAINTAINER(S) WITHIN A REASONABLE TIMEFRAME! ALL +# UNAUTHORISED CHANGES WILL BE UNCONDITIONALLY REVERTED! + +bsd_use_mk_MAINTAINER= portmgr@FreeBSD.org + +.if defined(USE_LINUX_RPM) +.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" +.endif + +.if defined(USE_LINUX_APPS) +.include "${PORTSDIR}/Mk/bsd.linux-apps.mk" +.endif + +.if defined(USE_XORG) || defined(XORG_CAT) +.include "${PORTSDIR}/Mk/bsd.xorg.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 + +.include "${PORTSDIR}/Mk/bsd.perl.mk" + +.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_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART) +.include "${PORTSDIR}/Mk/bsd.efl.mk" +.endif + +.if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL) +.include "${PORTSDIR}/Mk/bsd.fpc.mk" +.endif + +.if defined(USE_JAVA) +.include "${PORTSDIR}/Mk/bsd.java.mk" +.endif + +.if defined(USE_R_MOD) +.include "${PORTSDIR}/Mk/bsd.cran.mk" +.endif + +.if defined(USE_RUBY) || defined(USE_LIBRUBY) +.include "${PORTSDIR}/Mk/bsd.ruby.mk" +.endif + +.if defined(USE_OCAML) +.include "${PORTSDIR}/Mk/bsd.ocaml.mk" +.endif + +.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TCL_RUN) || defined(USE_TCL_WRAPPER) || defined(USE_TK) || defined(USE_TK_BUILD) || defined(USE_TK_RUN) || defined(USE_TK_WRAPPER) +.include "${PORTSDIR}/Mk/bsd.tcl.mk" +.endif + +.if defined(USE_APACHE) || defined(USE_APACHE_BUILD) || defined(USE_APACHE_RUN) +.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(USE_DRUPAL) +.include "${PORTSDIR}/Mk/bsd.drupal.mk" +.endif + +.if defined(WANT_GECKO) || defined(USE_GECKO) || defined(USE_FIREFOX) || defined(USE_FIREFOX_BUILD) || defined(USE_SEAMONKEY) || defined(USE_SEAMONKEY_BUILD) || defined(USE_THUNDERBIRD) || defined(USE_THUNDERBIRD_BUILD) +.include "${PORTSDIR}/Mk/bsd.gecko.mk" +.endif + +.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(INSTALLS_ICONS) +.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_QMAIL) || defined(USE_QMAIL_RUN) || defined(USE_QMAIL_BUILD) || defined(WANT_QMAIL) +.include "${PORTSDIR}/Mk/bsd.mail.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_NCURSES) +.include "${PORTSDIR}/Mk/bsd.ncurses.mk" +.endif + +.if defined(USE_GCC) || defined(USE_FORTRAN) +.include "${PORTSDIR}/Mk/bsd.gcc.mk" +.endif + +.if defined(USE_OPENLDAP) || defined(WANT_OPENLDAP_VER) +.include "${PORTSDIR}/Mk/bsd.ldap.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) || defined(USE_FIREBIRD) +.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_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART) +.include "${PORTSDIR}/Mk/bsd.efl.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_LINUX_APPS) +.include "${PORTSDIR}/Mk/bsd.linux-apps.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 + +.include "${PORTSDIR}/Mk/bsd.perl.mk" + +.if defined(USE_PHP) +.include "${PORTSDIR}/Mk/bsd.php.mk" +.endif + +.if defined(USE_PYTHON) +.include "${PORTSDIR}/Mk/bsd.python.mk" +.endif + +.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TK) || defined(USE_TK_BUILD) +.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(USE_APACHE_BUILD) || defined(USE_APACHE_RUN) +.include "${PORTSDIR}/Mk/bsd.apache.mk" +.endif + +.if defined(USE_AUTOTOOLS) +.include "${PORTSDIR}/Mk/bsd.autotools.mk" +.endif + +.if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL) +.include "${PORTSDIR}/Mk/bsd.fpc.mk" +.endif + +.if defined(WANT_GECKO) || defined(USE_GECKO) +.include "${PORTSDIR}/Mk/bsd.gecko.mk" +.endif + +.if defined(WANT_GNOME) || defined(USE_GNOME) +.include "${PORTSDIR}/Mk/bsd.gnome.mk" +.endif + +.if defined(USE_XFCE) +.include "${PORTSDIR}/Mk/bsd.xfce.mk" +.endif + +.if defined(USE_KDE4) +.include "${PORTSDIR}/Mk/bsd.kde4.mk" +.endif + +.if defined(USE_CMAKE) +.include "${PORTSDIR}/Mk/bsd.cmake.mk" +.endif + --- bsd-include-mk.diff ends here --- -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BLU0-SMTP15000F1389DC7AD94C109EDA9190>