Subject: cd /usr/pkgsrc && grep -r ZOULARIS *
To: None <tech-pkg@netbsd.org>
From: Jesper Louis Andersen <jlouis@mongers.org>
List: tech-pkg
Date: 11/09/2004 16:23:53
The subject line finds a number of problematic spots:

devel/newmkdep:

--- Makefile.orig	2004-01-20 13:13:28.000000000 +0100
+++ Makefile
@@ -11,10 +11,4 @@ WRKSRC=		${WRKDIR}/newmkdep
 NO_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CFLAGS+=	-I/usr/include -I${ZOULARISBASE}/include
-LDFLAGS+=	-L${ZOULARISBASE}/lib -lbsdcompat
-.endif
-
 .include "../../mk/bsd.pkg.mk"

lang/python20:

--- Makefile.orig	2004-11-02 11:10:19.000000000 +0100
+++ Makefile
@@ -43,12 +43,6 @@ FIX_RPATH+=	SSLFLAGS
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-ZOULARIS?=	${PREFIX}/bsd
-MODADD=		-I${ZOULARIS}/include -L${ZOULARIS}/lib ${COMPILER_RPATH_FLAG}${ZOULARIS}/lib
-FIX_RPATH+=	MODADD
-.endif
-
 pre-configure:
 	${SED}  -e 's,@NOSHARED@,${NOSHARED},g' \
 		-e 's,@MODADD@,${MODADD},g' \

pkgtools/dfdisk:

--- pkgtools/dfdisk/Makefile.orig	2004-01-20 13:23:57.000000000 +0100
+++ pkgtools/dfdisk/Makefile
@@ -21,8 +21,8 @@ FILES_SUBST+=	PKGVERSION="${PKGVERSION}"
 
 .include "../../mk/bsd.prefs.mk"
 
-.if exists(${ZOULARISBASE}/bin/ftp)
-FILES_SUBST+=	FTP="${ZOULARISBASE}/bin/ftp -p"
+.if exists(${PREFIX}/bin/ftp)
+FILES_SUBST+=	FTP="${PREFIX}/bin/ftp -p"
 .else
 FILES_SUBST+=	FTP="/usr/bin/ftp -p"
 .endif

pkgtools/gensolpkg/patches/patch-aa

** Should be deleted, only refers to changes and ZOULARISBASE

print/ghostscript-gnu:

--- print/ghostscript-gnu/Makefile.common.orig	2004-08-27 08:29:10.000000000 +0200
+++ print/ghostscript-gnu/Makefile.common
@@ -54,10 +54,6 @@ CFLAGS+=		-DHAVE_MKSTEMP=1
 MAKE_FLAGS+=		XCFLAGS="${CFLAGS}"
 MAKE_FLAGS+=		XLDFLAGS="${LDFLAGS}"
 
-.if ${OPSYS} == "SunOS"
-LDFLAGS+=		-L${ZOULARISBASE}/lib ${COMPILER_RPATH_FLAG}${ZOULARISBASE}/lib
-.endif
-
 REPLACE_PERL=		lib/fixmswrd.pl
 
 GS_RESOURCEDIR=		${PREFIX}/share/ghostscript/Resource

print/ghostscript-nox11:

--- print/ghostscript-nox11/Makefile.common.orig	2004-08-27 08:29:10.000000000 +0200
+++ print/ghostscript-nox11/Makefile.common
@@ -141,10 +141,6 @@ GCC_REQD+=		2.95.3
 GCC_REQD+=		3.0
 .endif
 
-.if defined(ZOULARISBASE)
-LDFLAGS+=	-L${ZOULARISBASE}/lib ${COMPILER_RPATH_FLAG}${ZOULARISBASE}/lib
-.endif
-
 .if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
 CFLAGS+=		-DA4
 .endif

That is all ;)

I am not sure if I am doing anything correct, though in that case this
posting can be seen as a ``theres something rotten here and there''-posting.

-- 
< Keltus> .. now back to reading my /. and compiling my \
  l33t gentoo linux which makes it 5000% faster than \
  your lame not-even-a-real-OS computer. Uptime: 20000 days, 4 hours