mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Bring this up to date with respect to the master copy.

Browse Source
This commit is contained in:
Mark Linimon 2006-01-21 23:59:09 +00:00
parent 73d1ef6ea2
commit f5bf891663
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=154102
2 changed files with 60 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
devel/portmk/Mk/bsd.port.mk
View File

@ -1346,9 +1346,8 @@ PERL= ${LOCALBASE}/bin/perl
.if defined(USE_LOCAL_MK) .if defined(USE_LOCAL_MK)
.if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.local.mk" .include "${DEVELPORTSDIR}/Mk/bsd.local.mk"
# not yet: .else
#.else .include "${PORTSDIR}/Mk/bsd.local.mk"
#.include "${PORTSDIR}/Mk/bsd.local.mk"
.endif .endif
.endif .endif
@ -1575,15 +1574,6 @@ MAKE_ENV+= CC="${CC}" CXX="${CXX}"
USE_REINPLACE= yes USE_REINPLACE= yes
.endif .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 defined(USE_GCC)
.if exists(${DEVELPORTSDIR}/Mk/bsd.gcc.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.gcc.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.gcc.mk" .include "${DEVELPORTSDIR}/Mk/bsd.gcc.mk"
@ -1869,6 +1859,14 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.endif .endif
.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) || \ .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \
defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \ defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \
defined(USE_BDB) || defined(USE_SQLITE) defined(USE_BDB) || defined(USE_SQLITE)
@ -1879,14 +1877,6 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.endif .endif
.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 defined(WANT_GSTREAMER) || defined(USE_GSTREAMER)
.if exists(${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk" .include "${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk"
@ -1895,6 +1885,14 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.endif .endif
.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 defined(USE_SDL) || defined(WANT_SDL)
.if exists(${DEVELPORTSDIR}/Mk/bsd.sdl.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.sdl.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.sdl.mk" .include "${DEVELPORTSDIR}/Mk/bsd.sdl.mk"
@ -1927,17 +1925,18 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.endif .endif
.endif .endif
# XXX: (not yet): .if defined(USE_AUTOTOOLS)
.if exists(${DEVELPORTSDIR}/Mk/bsd.autotools.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.autotools.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.autotools.mk" .include "${DEVELPORTSDIR}/Mk/bsd.autotools.mk"
.else .else
.include "${PORTSDIR}/Mk/bsd.autotools.mk" .include "${PORTSDIR}/Mk/bsd.autotools.mk"
.endif .endif
# XXX: (not yet): .endif
.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK)
.if defined(USE_LINUX_RPM) .if exists(${DEVELPORTSDIR}/Mk/bsd.gnome.mk)
.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" .include "${DEVELPORTSDIR}/Mk/bsd.gnome.mk"
.else
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
.endif
.endif .endif
.if exists(${PORTSDIR}/../Makefile.inc) .if exists(${PORTSDIR}/../Makefile.inc)
@ -2125,8 +2124,6 @@ EXTRACT_CMD?= ${GZIP_CMD}
# uses X # uses X
.if ${X_WINDOW_SYSTEM:L} == xfree86-3 .if ${X_WINDOW_SYSTEM:L} == xfree86-3
MTREE_FILE= /etc/mtree/BSD.x11.dist 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 .else
MTREE_FILE= /etc/mtree/BSD.x11-4.dist MTREE_FILE= /etc/mtree/BSD.x11-4.dist
.endif .endif
@ -3418,6 +3415,12 @@ do-patch:
fi fi
.endif .endif
# XXX - To be tested later
#.if !target(run-autotools) && !defined(USE_AUTOTOOLS)
#run-autotools:
# ${DO_NADA}
#.endif
# Configure # Configure
.if !target(do-configure) .if !target(do-configure)

57
ports-mgmt/portmk/Mk/bsd.port.mk
View File

@ -1346,9 +1346,8 @@ PERL= ${LOCALBASE}/bin/perl
.if defined(USE_LOCAL_MK) .if defined(USE_LOCAL_MK)
.if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.local.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.local.mk" .include "${DEVELPORTSDIR}/Mk/bsd.local.mk"
# not yet: .else
#.else .include "${PORTSDIR}/Mk/bsd.local.mk"
#.include "${PORTSDIR}/Mk/bsd.local.mk"
.endif .endif
.endif .endif
@ -1575,15 +1574,6 @@ MAKE_ENV+= CC="${CC}" CXX="${CXX}"
USE_REINPLACE= yes USE_REINPLACE= yes
.endif .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 defined(USE_GCC)
.if exists(${DEVELPORTSDIR}/Mk/bsd.gcc.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.gcc.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.gcc.mk" .include "${DEVELPORTSDIR}/Mk/bsd.gcc.mk"
@ -1869,6 +1859,14 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.endif .endif
.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) || \ .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \
defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \ defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \
defined(USE_BDB) || defined(USE_SQLITE) defined(USE_BDB) || defined(USE_SQLITE)
@ -1879,14 +1877,6 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.endif .endif
.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 defined(WANT_GSTREAMER) || defined(USE_GSTREAMER)
.if exists(${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk" .include "${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk"
@ -1895,6 +1885,14 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.endif .endif
.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 defined(USE_SDL) || defined(WANT_SDL)
.if exists(${DEVELPORTSDIR}/Mk/bsd.sdl.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.sdl.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.sdl.mk" .include "${DEVELPORTSDIR}/Mk/bsd.sdl.mk"
@ -1927,17 +1925,18 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.endif .endif
.endif .endif
# XXX: (not yet): .if defined(USE_AUTOTOOLS)
.if exists(${DEVELPORTSDIR}/Mk/bsd.autotools.mk) .if exists(${DEVELPORTSDIR}/Mk/bsd.autotools.mk)
.include "${DEVELPORTSDIR}/Mk/bsd.autotools.mk" .include "${DEVELPORTSDIR}/Mk/bsd.autotools.mk"
.else .else
.include "${PORTSDIR}/Mk/bsd.autotools.mk" .include "${PORTSDIR}/Mk/bsd.autotools.mk"
.endif .endif
# XXX: (not yet): .endif
.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK)
.if defined(USE_LINUX_RPM) .if exists(${DEVELPORTSDIR}/Mk/bsd.gnome.mk)
.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" .include "${DEVELPORTSDIR}/Mk/bsd.gnome.mk"
.else
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
.endif
.endif .endif
.if exists(${PORTSDIR}/../Makefile.inc) .if exists(${PORTSDIR}/../Makefile.inc)
@ -2125,8 +2124,6 @@ EXTRACT_CMD?= ${GZIP_CMD}
# uses X # uses X
.if ${X_WINDOW_SYSTEM:L} == xfree86-3 .if ${X_WINDOW_SYSTEM:L} == xfree86-3
MTREE_FILE= /etc/mtree/BSD.x11.dist 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 .else
MTREE_FILE= /etc/mtree/BSD.x11-4.dist MTREE_FILE= /etc/mtree/BSD.x11-4.dist
.endif .endif
@ -3418,6 +3415,12 @@ do-patch:
fi fi
.endif .endif
# XXX - To be tested later
#.if !target(run-autotools) && !defined(USE_AUTOTOOLS)
#run-autotools:
# ${DO_NADA}
#.endif
# Configure # Configure
.if !target(do-configure) .if !target(do-configure)