diff options
| author | hubertf <hubertf> | 2001-02-03 08:07:33 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2001-02-03 08:07:33 +0000 |
| commit | dfdf5d11edd3168c04ceda20f56321f7f3249ada (patch) | |
| tree | 094bd94e3610f096d207b1599b44dc55673a3700 /devel | |
| parent | 2bb2c8c6de466309d675efa4bb33495356496a5e (diff) | |
| download | pkgsrc-dfdf5d11edd3168c04ceda20f56321f7f3249ada.tar.gz | |
Don't allow non-pkgsrc zlib installed. Per discussion on tech-pkg.
(This makes me wonder how things work when I setup a system from solaris
pkgs only, that were generated from pkgsrc - i doubt they have the /var/db/pkg
information to make our system recognize them as "our" pkg... ?)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cvs/Makefile | 4 | ||||
| -rw-r--r-- | devel/gtexinfo/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index d4cf06ba8cd..711adbfba2e 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2001/01/21 18:13:31 tron Exp $ +# $NetBSD: Makefile,v 1.36 2001/02/03 08:07:34 hubertf Exp $ # DISTNAME= cvs-1.11 @@ -15,7 +15,7 @@ USE_GTEXINFO= yes .include "../../mk/bsd.prefs.mk" -.if (${OPSYS} == "SunOS") && !exists(/usr/lib/libz.so) +.if (${OPSYS} == "SunOS") DEPENDS+= zlib-*:../../devel/zlib CFLAGS+= -I${PREFIX}/include # zlib.h .endif diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile index 8d85f8b190b..f3e00db397c 100644 --- a/devel/gtexinfo/Makefile +++ b/devel/gtexinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/02/03 06:12:36 hubertf Exp $ +# $NetBSD: Makefile,v 1.22 2001/02/03 08:07:33 hubertf Exp $ # DISTNAME= texinfo-3.12 @@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/texinfo/texinfo.html .include "../../mk/bsd.prefs.mk" -.if (${OPSYS} == "SunOS") && !exists(/usr/lib/libz.so) +.if (${OPSYS} == "SunOS") DEPENDS+= zlib-1.*:../zlib CFLAGS+= -I${PREFIX}/include # zlib.h .endif |