Make this package work on Solaris.

3 files changed, 24 insertions, 33 deletions

diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 86263d67399..2f4b5c771da 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2000/02/20 22:05:42 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2000/03/23 11:58:32 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
@@ -26,8 +26,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		"--datadir=${PREFIX}/share/kde" \
 			"--with-qt-dir=${PREFIX}" \
 			"--with-qt-includes=${PREFIX}/include/qt"
-CPPFLAGS+=		-I${LOCALBASE}/include
-CFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ENV=  	KDEDIR=${PREFIX} \
 			CPPFLAGS="${CPPFLAGS}" \
 			CXXFLAGS="${CFLAGS}" \
@@ -40,12 +38,20 @@ PLIST_SRC=		${PKGDIR}/PLIST.egcs
 PLIST_SRC=		${PKGDIR}/PLIST.gcc
 .endif
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+PLIST_SRC=		${PKGDIR}/PLIST-SunOS
+CPPFLAGS=		-I${LOCALBASE}/include
+CFLAGS=			-I${LOCALBASE}/include
+.elif ${OPSYS} == "NetBSD"
+CPPFLAGS+=		-I${LOCALBASE}/include
+CFLAGS+=		-I${LOCALBASE}/include
+.endif
+
 post-install:
 .if (${GCC_VERSION:C/-.*$$//} != egcs)
 	@${FIND} ${PREFIX}/share/kde/locale -name ksirc.mo | xargs ${RM}
 .endif
 
 .include "../../mk/bsd.pkg.mk"
-.if (${OPSYS} == "SunOS")
-PLIST_SRC= ${PKGDIR}/PLIST-SunOS
-.endif
diff --git a/net/kdenetwork/pkg/PLIST-SunOS b/net/kdenetwork/pkg/PLIST-SunOS
index 1b7e2127a7f..9ed00f7f3ad 100644
--- a/net/kdenetwork/pkg/PLIST-SunOS
+++ b/net/kdenetwork/pkg/PLIST-SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST-SunOS,v 1.1 1999/12/06 20:44:58 bouyer Exp $
+@comment $NetBSD: PLIST-SunOS,v 1.2 2000/03/23 11:58:32 agc Exp $
 bin/dsirc
 bin/karchie
 bin/kbiff
@@ -321,7 +321,6 @@ share/kde/locale/br/LC_MESSAGES/kmail.mo
 share/kde/locale/br/LC_MESSAGES/knu.mo
 share/kde/locale/br/LC_MESSAGES/korn.mo
 share/kde/locale/br/LC_MESSAGES/krn.mo
-share/kde/locale/br/LC_MESSAGES/ksirc.mo
 share/kde/locale/br/LC_MESSAGES/ktalkd.mo
 share/kde/locale/ca/LC_MESSAGES/kcmktalkd.mo
 share/kde/locale/ca/LC_MESSAGES/kfinger.mo
@@ -337,7 +336,6 @@ share/kde/locale/cs/LC_MESSAGES/kmail.mo
 share/kde/locale/cs/LC_MESSAGES/knu.mo
 share/kde/locale/cs/LC_MESSAGES/korn.mo
 share/kde/locale/cs/LC_MESSAGES/krn.mo
-share/kde/locale/cs/LC_MESSAGES/ksirc.mo
 share/kde/locale/cs/LC_MESSAGES/ktalkd.mo
 share/kde/locale/da/LC_MESSAGES/karchie.mo
 share/kde/locale/da/LC_MESSAGES/kbiff.mo
@@ -347,7 +345,6 @@ share/kde/locale/da/LC_MESSAGES/kmail.mo
 share/kde/locale/da/LC_MESSAGES/knu.mo
 share/kde/locale/da/LC_MESSAGES/korn.mo
 share/kde/locale/da/LC_MESSAGES/krn.mo
-share/kde/locale/da/LC_MESSAGES/ksirc.mo
 share/kde/locale/da/LC_MESSAGES/ktalkd.mo
 share/kde/locale/de/LC_MESSAGES/karchie.mo
 share/kde/locale/de/LC_MESSAGES/kbiff.mo
@@ -357,7 +354,6 @@ share/kde/locale/de/LC_MESSAGES/kmail.mo
 share/kde/locale/de/LC_MESSAGES/knu.mo
 share/kde/locale/de/LC_MESSAGES/korn.mo
 share/kde/locale/de/LC_MESSAGES/krn.mo
-share/kde/locale/de/LC_MESSAGES/ksirc.mo
 share/kde/locale/de/LC_MESSAGES/ktalkd.mo
 share/kde/locale/el/LC_MESSAGES/kmail.mo
 share/kde/locale/el/LC_MESSAGES/knu.mo
@@ -370,7 +366,6 @@ share/kde/locale/eo/LC_MESSAGES/kmail.mo
 share/kde/locale/eo/LC_MESSAGES/knu.mo
 share/kde/locale/eo/LC_MESSAGES/korn.mo
 share/kde/locale/eo/LC_MESSAGES/krn.mo
-share/kde/locale/eo/LC_MESSAGES/ksirc.mo
 share/kde/locale/eo/LC_MESSAGES/ktalkd.mo
 share/kde/locale/es/LC_MESSAGES/kbiff.mo
 share/kde/locale/es/LC_MESSAGES/kfinger.mo
@@ -388,7 +383,6 @@ share/kde/locale/fi/LC_MESSAGES/kmail.mo
 share/kde/locale/fi/LC_MESSAGES/knu.mo
 share/kde/locale/fi/LC_MESSAGES/korn.mo
 share/kde/locale/fi/LC_MESSAGES/krn.mo
-share/kde/locale/fi/LC_MESSAGES/ksirc.mo
 share/kde/locale/fi/LC_MESSAGES/ktalkd.mo
 share/kde/locale/fr/LC_MESSAGES/karchie.mo
 share/kde/locale/fr/LC_MESSAGES/kbiff.mo
@@ -398,14 +392,12 @@ share/kde/locale/fr/LC_MESSAGES/kmail.mo
 share/kde/locale/fr/LC_MESSAGES/knu.mo
 share/kde/locale/fr/LC_MESSAGES/korn.mo
 share/kde/locale/fr/LC_MESSAGES/krn.mo
-share/kde/locale/fr/LC_MESSAGES/ksirc.mo
 share/kde/locale/fr/LC_MESSAGES/ktalkd.mo
 share/kde/locale/hr/LC_MESSAGES/kbiff.mo
 share/kde/locale/hr/LC_MESSAGES/kfinger.mo
 share/kde/locale/hr/LC_MESSAGES/kmail.mo
 share/kde/locale/hr/LC_MESSAGES/knu.mo
 share/kde/locale/hr/LC_MESSAGES/krn.mo
-share/kde/locale/hr/LC_MESSAGES/ksirc.mo
 share/kde/locale/hr/LC_MESSAGES/ktalkd.mo
 share/kde/locale/hs/LC_MESSAGES/kmail.mo
 share/kde/locale/hs/LC_MESSAGES/krn.mo
@@ -422,7 +414,6 @@ share/kde/locale/is/LC_MESSAGES/kmail.mo
 share/kde/locale/is/LC_MESSAGES/knu.mo
 share/kde/locale/is/LC_MESSAGES/korn.mo
 share/kde/locale/is/LC_MESSAGES/krn.mo
-share/kde/locale/is/LC_MESSAGES/ksirc.mo
 share/kde/locale/is/LC_MESSAGES/ktalkd.mo
 share/kde/locale/it/LC_MESSAGES/kbiff.mo
 share/kde/locale/it/LC_MESSAGES/kcmktalkd.mo
@@ -440,7 +431,6 @@ share/kde/locale/ja/LC_MESSAGES/kmail.mo
 share/kde/locale/ja/LC_MESSAGES/knu.mo
 share/kde/locale/ja/LC_MESSAGES/korn.mo
 share/kde/locale/ja/LC_MESSAGES/krn.mo
-share/kde/locale/ja/LC_MESSAGES/ksirc.mo
 share/kde/locale/ja/LC_MESSAGES/ktalkd.mo
 share/kde/locale/ko/LC_MESSAGES/kmail.mo
 share/kde/locale/ko/LC_MESSAGES/knu.mo
@@ -458,7 +448,6 @@ share/kde/locale/no/LC_MESSAGES/kmail.mo
 share/kde/locale/no/LC_MESSAGES/knu.mo
 share/kde/locale/no/LC_MESSAGES/korn.mo
 share/kde/locale/no/LC_MESSAGES/krn.mo
-share/kde/locale/no/LC_MESSAGES/ksirc.mo
 share/kde/locale/no/LC_MESSAGES/ktalkd.mo
 share/kde/locale/pl/LC_MESSAGES/karchie.mo
 share/kde/locale/pl/LC_MESSAGES/kbiff.mo
@@ -468,7 +457,6 @@ share/kde/locale/pl/LC_MESSAGES/kmail.mo
 share/kde/locale/pl/LC_MESSAGES/knu.mo
 share/kde/locale/pl/LC_MESSAGES/korn.mo
 share/kde/locale/pl/LC_MESSAGES/krn.mo
-share/kde/locale/pl/LC_MESSAGES/ksirc.mo
 share/kde/locale/pl/LC_MESSAGES/ktalkd.mo
 share/kde/locale/pt/LC_MESSAGES/kbiff.mo
 share/kde/locale/pt/LC_MESSAGES/kcmktalkd.mo
@@ -476,7 +464,6 @@ share/kde/locale/pt/LC_MESSAGES/kfinger.mo
 share/kde/locale/pt/LC_MESSAGES/kmail.mo
 share/kde/locale/pt/LC_MESSAGES/knu.mo
 share/kde/locale/pt/LC_MESSAGES/krn.mo
-share/kde/locale/pt/LC_MESSAGES/ksirc.mo
 share/kde/locale/pt/LC_MESSAGES/ktalkd.mo
 share/kde/locale/pt_BR/LC_MESSAGES/karchie.mo
 share/kde/locale/pt_BR/LC_MESSAGES/kbiff.mo
@@ -487,7 +474,6 @@ share/kde/locale/pt_BR/LC_MESSAGES/kmail.mo
 share/kde/locale/pt_BR/LC_MESSAGES/knu.mo
 share/kde/locale/pt_BR/LC_MESSAGES/korn.mo
 share/kde/locale/pt_BR/LC_MESSAGES/krn.mo
-share/kde/locale/pt_BR/LC_MESSAGES/ksirc.mo
 share/kde/locale/pt_BR/LC_MESSAGES/ktalkd.mo
 share/kde/locale/ro/LC_MESSAGES/kfinger.mo
 share/kde/locale/ro/LC_MESSAGES/kmail.mo
@@ -499,7 +485,6 @@ share/kde/locale/ru/LC_MESSAGES/kmail.mo
 share/kde/locale/ru/LC_MESSAGES/knu.mo
 share/kde/locale/ru/LC_MESSAGES/korn.mo
 share/kde/locale/ru/LC_MESSAGES/krn.mo
-share/kde/locale/ru/LC_MESSAGES/ksirc.mo
 share/kde/locale/ru/LC_MESSAGES/ktalkd.mo
 share/kde/locale/sk/LC_MESSAGES/karchie.mo
 share/kde/locale/sk/LC_MESSAGES/kbiff.mo
@@ -509,7 +494,6 @@ share/kde/locale/sk/LC_MESSAGES/kmail.mo
 share/kde/locale/sk/LC_MESSAGES/knu.mo
 share/kde/locale/sk/LC_MESSAGES/korn.mo
 share/kde/locale/sk/LC_MESSAGES/krn.mo
-share/kde/locale/sk/LC_MESSAGES/ksirc.mo
 share/kde/locale/sk/LC_MESSAGES/ktalkd.mo
 share/kde/locale/sl/LC_MESSAGES/karchie.mo
 share/kde/locale/sl/LC_MESSAGES/kbiff.mo
@@ -519,7 +503,6 @@ share/kde/locale/sl/LC_MESSAGES/kmail.mo
 share/kde/locale/sl/LC_MESSAGES/knu.mo
 share/kde/locale/sl/LC_MESSAGES/korn.mo
 share/kde/locale/sl/LC_MESSAGES/krn.mo
-share/kde/locale/sl/LC_MESSAGES/ksirc.mo
 share/kde/locale/sl/LC_MESSAGES/ktalkd.mo
 share/kde/locale/sv/LC_MESSAGES/karchie.mo
 share/kde/locale/sv/LC_MESSAGES/kbiff.mo
@@ -529,7 +512,6 @@ share/kde/locale/sv/LC_MESSAGES/kmail.mo
 share/kde/locale/sv/LC_MESSAGES/knu.mo
 share/kde/locale/sv/LC_MESSAGES/korn.mo
 share/kde/locale/sv/LC_MESSAGES/krn.mo
-share/kde/locale/sv/LC_MESSAGES/ksirc.mo
 share/kde/locale/sv/LC_MESSAGES/ktalkd.mo
 share/kde/locale/tr/LC_MESSAGES/kmail.mo
 share/kde/locale/tr/LC_MESSAGES/knu.mo
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index a400c3eff5a..06551bd74ea 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2000/02/05 15:51:04 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2000/03/23 11:58:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
@@ -15,7 +15,6 @@ HOMEPAGE=       http://www.kde.org/
 BUILD_DEPENDS+=	${LOCALBASE}/bin/msgfmt:../../devel/gettext
 DEPENDS+=	Mesa-*:../../graphics/Mesa
 DEPENDS+=	kdelibs-1.1.2:../../x11/kdelibs
-DEPENDS+=	ncurses>=4.2:../../devel/ncurses
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 # kdebase doesn't manipulate GIFs, but KDE packages depending on kdebase
 # often do, so put the dependency here.
@@ -44,6 +43,15 @@ KDE_DIRS=	share/doc/kde/HTML/cs share/doc/kde/HTML/da \
 		share/doc/kde/HTML/it share/doc/kde/HTML/no \
 		share/doc/kde/HTML/pl share/doc/kde/HTML/sv
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+PLIST_INIT=	${PKGDIR}/PLIST-${OPSYS}
+.else
+DEPENDS+=	ncurses>=4.2:../../devel/ncurses
+PLIST_INIT=	${PKGDIR}/PLIST
+.endif
+
 post-extract:
 	@${LN} -fs ${FILESDIR}/info_netbsd.cpp ${WRKSRC}/kcontrol/info
 	@${LN} -fs ${FILESDIR}/memory_netbsd.cpp ${WRKSRC}/kcontrol/info
@@ -64,7 +72,7 @@ post-install:
 	cd ${PREFIX}/share/kde/config ; \
 	${CP} kdmrc kdmrc.new ; \
 	${SED} \
-		-e 's|^\(GreetString\)=.*|\1=Welcome to NetBSD! [HOSTNAME]|' \
+		-e 's|^\(GreetString\)=.*|\1=Welcome to ${OPSYS}! [HOSTNAME]|' \
 		<kdmrc.new >kdmrc ; \
 	${ECHO} 'LogoPixmap=${PREFIX}/share/kde/icons/Daemon.png' >>kdmrc ; \
 	${RM} kdmrc.new
@@ -73,8 +81,3 @@ post-install:
 	  ${PREFIX}/share/doc/kde/HTML/en/kdm
 
 .include "../../mk/bsd.pkg.mk"
-.if (${OPSYS} == "SunOS")
-PLIST_INIT= ${PKGDIR}/PLIST-SunOS
-.else
-PLIST_INIT= ${PKGDIR}/PLIST
-.endif