Back out two patches that were not intended for commit.
This commit is contained in:
parent
5d91810c3c
commit
580cb54f2a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=17304
@ -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}
|
||||
|
@ -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.
|
||||
|
@ -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}
|
||||
|
@ -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.
|
||||
|
@ -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}
|
||||
|
2
x11/XFree86-4-clients/scripts/configure
vendored
2
x11/XFree86-4-clients/scripts/configure
vendored
@ -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.
|
||||
|
@ -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}
|
||||
|
2
x11/XFree86-4-libraries/scripts/configure
vendored
2
x11/XFree86-4-libraries/scripts/configure
vendored
@ -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.
|
||||
|
@ -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}
|
||||
|
2
x11/XFree86-4/scripts/configure
vendored
2
x11/XFree86-4/scripts/configure
vendored
@ -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.
|
||||
|
@ -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}
|
||||
|
2
x11/XFree86/scripts/configure
vendored
2
x11/XFree86/scripts/configure
vendored
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user