diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1999-03-08 07:28:36 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1999-03-08 07:28:36 +0000 |
| commit | e244b8bcccf929bfb91b2bc9027c62bc28d342ad (patch) | |
| tree | ca87e050de03316d0e07487ad68cd159a62ba2e8 /x11-servers/XFree86-4-Server-snap | |
| parent | (1) Change FETCH_CMD to add the -A flag, so it won't be confused by the (diff) | |
Fix to make ports work with bsd.port.mk rev. 1.306.
${MACHINE_ARCH}--freebsd${OSREL} is now passed to CONFIGURE_ARGS if
GNU_CONFIGURE is defined. Take the target out of CONFIGURE_ARGS of
some ports that added it explicitly; define it as
${MACHINE_ARCH}--freebsd if the port doesn't like the ${OSREL} part;
define it as something else (such as ${MACHINE_ARCH}--freebsdelf if
the port requires that; define it as an empty string if the port
doesn't like it at all.
The last might be a sign that a GNU_CONFIGURE port actually doesn't
use GNU's version of configure at all; but I don't have time to go
look at them all, we'll fix them as time goes on.
At least we've got much fewer "-unknown-"s in the tree as the result. :)
Notes
Notes:
svn path=/head/; revision=17053
Diffstat (limited to 'x11-servers/XFree86-4-Server-snap')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 5 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/scripts/configure | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index 9352c6b6ddd5..ac891dadbfc6 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -3,7 +3,7 @@ # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.51 1999/01/11 19:07:14 jmz Exp $ +# $Id: Makefile,v 1.52 1999/01/27 18:32:15 fenner Exp $ # DISTNAME= xc @@ -31,6 +31,7 @@ ALL_TARGET= World INSTALL_TARGET= install install.man DIST_SUBDIR= xc PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet +SCRIPTS_ENV= OSVERSION=${OSVERSION} # can't use USE_X_PREFIX here -- it will cause a circular dependency PREFIX= ${X11BASE} MTREE_FILE= /etc/mtree/BSD.x11.dist @@ -39,6 +40,8 @@ SCRIPTS_ENV+= MACHINE=pc98 PLIST= ${PKGDIR}/PLIST.pc98 .endif +PLIST= ${PKGDIR}/PLIST.stripped + .if defined(XDM_DES) && (${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO) pre-fetch: @${ECHO} diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index 892ec160e629..47d2cfa64187 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/scripts/configure @@ -230,7 +230,7 @@ else ELF=no fi -if [ ! `uname -r|grep ^2` ]; then +if [ ${OSVERSION} -ge 300000 ]; then cat <<'END' FreeBSD-3.x has support for Secure RPC. |