Revert to previous configuration:

LOWER_OPSYS for Solaris is solaris.
Remove the ugly hacks which had been introduced to workaround previous
misunderstanding.

5 files changed, 7 insertions, 13 deletions

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index e6d72540ae3..68ab3595ea1 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.10 1999/07/08 07:58:42 agc Exp $
+# $NetBSD: bsd.prefs.mk,v 1.11 1999/07/08 08:06:59 agc Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -43,7 +43,7 @@ MACHINE_GNU_ARCH?=	${GNU_ARCH.${MACHINE_ARCH}}
 LOWER_OPSYS?=		netbsd
 .elif ${OPSYS} == "SunOS"
 LOWER_VENDOR?=		sun
-LOWER_OPSYS?=		sunos
+LOWER_OPSYS?=		solaris
 .elif ${OPSYS} == "Linux"
 LOWER_OPSYS?=		linux
 .elif !defined(LOWER_OPSYS)
diff --git a/security/tripwire/files/conf-sunos.h b/security/tripwire/files/conf-solaris.h
index d54b3375880..d54b3375880 100644
--- a/security/tripwire/files/conf-sunos.h
+++ b/security/tripwire/files/conf-solaris.h
diff --git a/security/tripwire/files/tw.conf.sunos b/security/tripwire/files/tw.conf.solaris
index 503f5a7c799..8df09aa6b09 100644
--- a/security/tripwire/files/tw.conf.sunos
+++ b/security/tripwire/files/tw.conf.solaris
@@ -1,4 +1,4 @@
-# $NetBSD: tw.conf.sunos,v 1.1 1999/07/06 11:32:42 agc Exp $
+# $NetBSD: tw.conf.solaris,v 1.3 1999/07/08 08:07:00 agc Exp $
 # Original Id: tw.conf.386bsd,v 1.1 1993/11/22 06:38:01 genek Exp
 #
 # tripwire.config
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 60b997454dd..1204da3cea0 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 1999/07/07 18:13:56 agc Exp $
+# $NetBSD: Makefile,v 1.22 1999/07/08 08:06:59 agc Exp $
 # FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp
 #
 
@@ -17,7 +17,7 @@ HOMEPAGE=		http://www-rcd.cc.purdue.edu/~abe/
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ARGS=		-n ${REAL_LOWER_OPSYS}
+CONFIGURE_ARGS=		-n ${LOWER_OPSYS}
 
 SRCBALL_NAME=		${DISTNAME:S/_W$//}
 
@@ -27,11 +27,8 @@ SRCBALL_NAME=		${DISTNAME:S/_W$//}
 REAL_GROUP=		-g kmem
 .elif ${OPSYS} == "SunOS"
 MAKE_ENV+=		CPPFLAGS=
-REAL_LOWER_OPSYS=	solaris
 .endif
 
-REAL_LOWER_OPSYS?=	${LOWER_OPSYS}
-
 post-extract:
 	@(cd ${WRKDIR} ; \
 	EXPMD5=`${GREP} MD5 README.${SRCBALL_NAME} | ${SED} 's/^[ ]*//'` ; \
diff --git a/x11/qt/Makefile b/x11/qt/Makefile
index ffee8bbd08a..eac54246806 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 1999/07/07 17:34:51 agc Exp $
+# $NetBSD: Makefile,v 1.27 1999/07/08 08:06:59 agc Exp $
 #
 
 DISTNAME=	qt-1.44
@@ -22,14 +22,11 @@ ALL_TARGET=	src
 
 .if ${OPSYS} == "SunOS"
 DEPENDS+=	egcs-1.1.2:../../lang/egcs
-REAL_OPSYS=	solaris
 CXX=		${LOCALBASE}/egcs/bin/g++
-.else
-REAL_OPSYS=	${LOWER_OPSYS}
 .endif
 
 do-configure:
-	@cd ${WRKSRC} && ${MAKE} QTDIR=${WRKSRC} ${REAL_OPSYS}-g++-static
+	@cd ${WRKSRC} && ${MAKE} QTDIR=${WRKSRC} ${LOWER_OPSYS}-g++-static
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${PREFIX}/bin/