aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1999-03-20 06:35:28 +0800
committerasami <asami@FreeBSD.org>1999-03-20 06:35:28 +0800
commit812954685cee7c83db761df508ecdb02dd0fade4 (patch)
tree6f1d71847c089d2d060a070545c08eb38c22d3b8 /x11
parent6d817da725c61376c8e5945bd96cdfecf5c55365 (diff)
downloadfreebsd-ports-gnome-812954685cee7c83db761df508ecdb02dd0fade4.tar.gz
freebsd-ports-gnome-812954685cee7c83db761df508ecdb02dd0fade4.tar.zst
freebsd-ports-gnome-812954685cee7c83db761df508ecdb02dd0fade4.zip
Back out two patches that were not intended for commit.
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4-clients/Makefile5
-rw-r--r--x11/XFree86-4-clients/scripts/configure2
-rw-r--r--x11/XFree86-4-libraries/Makefile5
-rw-r--r--x11/XFree86-4-libraries/scripts/configure2
-rw-r--r--x11/XFree86-4/Makefile5
-rw-r--r--x11/XFree86-4/scripts/configure2
-rw-r--r--x11/XFree86/Makefile5
-rw-r--r--x11/XFree86/scripts/configure2
8 files changed, 8 insertions, 20 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index ac891dadbfc6..8f5ce209bee7 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/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/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 47d2cfa64187..892ec160e629 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/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/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index ac891dadbfc6..8f5ce209bee7 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/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/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index 47d2cfa64187..892ec160e629 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/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/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index ac891dadbfc6..8f5ce209bee7 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/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/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 47d2cfa64187..892ec160e629 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/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/XFree86/Makefile b/x11/XFree86/Makefile
index ac891dadbfc6..8f5ce209bee7 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/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/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 47d2cfa64187..892ec160e629 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/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.
generated by cgit (git 2.34.1) at 2024-11-27 11:25:39 +0800