diff options
| -rw-r--r-- | devel/portmk/Mk/bsd.port.mk | 57 | ||||
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.mk | 57 |
2 files changed, 60 insertions, 54 deletions
diff --git a/devel/portmk/Mk/bsd.port.mk b/devel/portmk/Mk/bsd.port.mk index cdb65fe66683..edcf013da9f8 100644 --- a/devel/portmk/Mk/bsd.port.mk +++ b/devel/portmk/Mk/bsd.port.mk @@ -1346,9 +1346,8 @@ PERL= ${LOCALBASE}/bin/perl .if defined(USE_LOCAL_MK) .if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk) .include "${DEVELPORTSDIR}/Mk/bsd.local.mk" -# not yet: -#.else -#.include "${PORTSDIR}/Mk/bsd.local.mk" +.else +.include "${PORTSDIR}/Mk/bsd.local.mk" .endif .endif @@ -1575,15 +1574,6 @@ MAKE_ENV+= CC="${CC}" CXX="${CXX}" USE_REINPLACE= yes .endif -.if defined(USE_LOCAL_MK) -.if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk) -.include "${DEVELPORTSDIR}/Mk/bsd.local.mk" -# not yet: -#.else -#.include "${PORTSDIR}/Mk/bsd.local.mk" -.endif -.endif - .if defined(USE_GCC) .if exists(${DEVELPORTSDIR}/Mk/bsd.gcc.mk) .include "${DEVELPORTSDIR}/Mk/bsd.gcc.mk" @@ -1869,6 +1859,14 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif +.if defined(USE_LOCAL_MK) +.if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.local.mk" +.else +.include "${PORTSDIR}/Mk/bsd.local.mk" +.endif +.endif + .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \ defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \ defined(USE_BDB) || defined(USE_SQLITE) @@ -1879,14 +1877,6 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif -.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) -.if exists(${DEVELPORTSDIR}/Mk/bsd.gnome.mk) -.include "${DEVELPORTSDIR}/Mk/bsd.gnome.mk" -.else -.include "${PORTSDIR}/Mk/bsd.gnome.mk" -.endif -.endif - .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) .if exists(${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk) .include "${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk" @@ -1895,6 +1885,14 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif +.if defined(USE_LINUX_RPM) +.if exists(${DEVELPORTSDIR}/Mk/bsd.linux-rpm.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.linux-rpm.mk" +.else +.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" +.endif +.endif + .if defined(USE_SDL) || defined(WANT_SDL) .if exists(${DEVELPORTSDIR}/Mk/bsd.sdl.mk) .include "${DEVELPORTSDIR}/Mk/bsd.sdl.mk" @@ -1927,17 +1925,18 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif -# XXX: (not yet): .if defined(USE_AUTOTOOLS) .if exists(${DEVELPORTSDIR}/Mk/bsd.autotools.mk) .include "${DEVELPORTSDIR}/Mk/bsd.autotools.mk" .else .include "${PORTSDIR}/Mk/bsd.autotools.mk" .endif -# XXX: (not yet): .endif - -.if defined(USE_LINUX_RPM) -.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" +.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) +.if exists(${DEVELPORTSDIR}/Mk/bsd.gnome.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.gnome.mk" +.else +.include "${PORTSDIR}/Mk/bsd.gnome.mk" +.endif .endif .if exists(${PORTSDIR}/../Makefile.inc) @@ -2125,8 +2124,6 @@ EXTRACT_CMD?= ${GZIP_CMD} # uses X .if ${X_WINDOW_SYSTEM:L} == xfree86-3 MTREE_FILE= /etc/mtree/BSD.x11.dist -.elif ${X_WINDOW_SYSTEM:L} == xorg -MTREE_FILE= ${PORTSDIR}/x11-servers/xorg-server/files/BSD.x11-xorg.dist .else MTREE_FILE= /etc/mtree/BSD.x11-4.dist .endif @@ -3418,6 +3415,12 @@ do-patch: fi .endif +# XXX - To be tested later +#.if !target(run-autotools) && !defined(USE_AUTOTOOLS) +#run-autotools: +# ${DO_NADA} +#.endif + # Configure .if !target(do-configure) diff --git a/ports-mgmt/portmk/Mk/bsd.port.mk b/ports-mgmt/portmk/Mk/bsd.port.mk index cdb65fe66683..edcf013da9f8 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.mk @@ -1346,9 +1346,8 @@ PERL= ${LOCALBASE}/bin/perl .if defined(USE_LOCAL_MK) .if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk) .include "${DEVELPORTSDIR}/Mk/bsd.local.mk" -# not yet: -#.else -#.include "${PORTSDIR}/Mk/bsd.local.mk" +.else +.include "${PORTSDIR}/Mk/bsd.local.mk" .endif .endif @@ -1575,15 +1574,6 @@ MAKE_ENV+= CC="${CC}" CXX="${CXX}" USE_REINPLACE= yes .endif -.if defined(USE_LOCAL_MK) -.if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk) -.include "${DEVELPORTSDIR}/Mk/bsd.local.mk" -# not yet: -#.else -#.include "${PORTSDIR}/Mk/bsd.local.mk" -.endif -.endif - .if defined(USE_GCC) .if exists(${DEVELPORTSDIR}/Mk/bsd.gcc.mk) .include "${DEVELPORTSDIR}/Mk/bsd.gcc.mk" @@ -1869,6 +1859,14 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif +.if defined(USE_LOCAL_MK) +.if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.local.mk" +.else +.include "${PORTSDIR}/Mk/bsd.local.mk" +.endif +.endif + .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \ defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \ defined(USE_BDB) || defined(USE_SQLITE) @@ -1879,14 +1877,6 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif -.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) -.if exists(${DEVELPORTSDIR}/Mk/bsd.gnome.mk) -.include "${DEVELPORTSDIR}/Mk/bsd.gnome.mk" -.else -.include "${PORTSDIR}/Mk/bsd.gnome.mk" -.endif -.endif - .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) .if exists(${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk) .include "${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk" @@ -1895,6 +1885,14 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif +.if defined(USE_LINUX_RPM) +.if exists(${DEVELPORTSDIR}/Mk/bsd.linux-rpm.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.linux-rpm.mk" +.else +.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" +.endif +.endif + .if defined(USE_SDL) || defined(WANT_SDL) .if exists(${DEVELPORTSDIR}/Mk/bsd.sdl.mk) .include "${DEVELPORTSDIR}/Mk/bsd.sdl.mk" @@ -1927,17 +1925,18 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif -# XXX: (not yet): .if defined(USE_AUTOTOOLS) .if exists(${DEVELPORTSDIR}/Mk/bsd.autotools.mk) .include "${DEVELPORTSDIR}/Mk/bsd.autotools.mk" .else .include "${PORTSDIR}/Mk/bsd.autotools.mk" .endif -# XXX: (not yet): .endif - -.if defined(USE_LINUX_RPM) -.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" +.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) +.if exists(${DEVELPORTSDIR}/Mk/bsd.gnome.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.gnome.mk" +.else +.include "${PORTSDIR}/Mk/bsd.gnome.mk" +.endif .endif .if exists(${PORTSDIR}/../Makefile.inc) @@ -2125,8 +2124,6 @@ EXTRACT_CMD?= ${GZIP_CMD} # uses X .if ${X_WINDOW_SYSTEM:L} == xfree86-3 MTREE_FILE= /etc/mtree/BSD.x11.dist -.elif ${X_WINDOW_SYSTEM:L} == xorg -MTREE_FILE= ${PORTSDIR}/x11-servers/xorg-server/files/BSD.x11-xorg.dist .else MTREE_FILE= /etc/mtree/BSD.x11-4.dist .endif @@ -3418,6 +3415,12 @@ do-patch: fi .endif +# XXX - To be tested later +#.if !target(run-autotools) && !defined(USE_AUTOTOOLS) +#run-autotools: +# ${DO_NADA} +#.endif + # Configure .if !target(do-configure) |