diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1999-03-19 22:35:28 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1999-03-19 22:35:28 +0000 |
| commit | 580cb54f2a1d22a9a679023eb0730ec25298c0af (patch) | |
| tree | 458de278cd5ec3b0a8ab384ae301180d085c0302 /x11-servers | |
| parent | Add ktranslator and kvidtune. (diff) | |
Back out two patches that were not intended for commit.
Notes
Notes:
svn path=/head/; revision=17304
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 5 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/scripts/configure | 2 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 5 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/scripts/configure | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index ac891dadbfc6..8f5ce209bee7 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.52 1999/01/27 18:32:15 fenner Exp $ +# $Id: Makefile,v 1.53 1999/03/08 07:28:35 asami Exp $ # DISTNAME= xc @@ -31,7 +31,6 @@ 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 @@ -40,8 +39,6 @@ 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 47d2cfa64187..892ec160e629 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 [ ${OSVERSION} -ge 300000 ]; then +if [ ! `uname -r|grep ^2` ]; then cat <<'END' FreeBSD-3.x has support for Secure RPC. diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index ac891dadbfc6..8f5ce209bee7 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -3,7 +3,7 @@ # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.52 1999/01/27 18:32:15 fenner Exp $ +# $Id: Makefile,v 1.53 1999/03/08 07:28:35 asami Exp $ # DISTNAME= xc @@ -31,7 +31,6 @@ 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 @@ -40,8 +39,6 @@ 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/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index 47d2cfa64187..892ec160e629 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -230,7 +230,7 @@ else ELF=no fi -if [ ${OSVERSION} -ge 300000 ]; then +if [ ! `uname -r|grep ^2` ]; then cat <<'END' FreeBSD-3.x has support for Secure RPC. |