From 064f3d9c6232e31c6822b95e817c86d72a64dcb1 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Wed, 17 Sep 2003 19:39:58 +0000
Subject: get rid of USE_GCC2/3 in pkg Makefiles, and set GCC_REQD or
 USE_PKGSRC_GCC as appropriate, as this is handled by compiler.mk now.

---
 print/ghostscript-esp/Makefile.common   | 10 +++++-----
 print/ghostscript-gnu/Makefile.common   | 10 +++++-----
 print/ghostscript-nox11/Makefile.common | 12 +++++-------
 print/hpijs/Makefile                    |  4 ++--
 4 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'print')

diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index 2869e412542..9a7e7312d16 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2003/09/12 20:07:26 grant Exp $
+# $NetBSD: Makefile.common,v 1.9 2003/09/17 19:40:59 grant Exp $
 
 DISTNAME=	espgs-${GS_VERS}-source
 BASEGS_VERS=	7.05
@@ -51,6 +51,10 @@ PLIST_SRC=		${.CURDIR}/../ghostscript-esp/PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD=	3.0
+.endif
+
 .if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
 CFLAGS+=		-DA4
 .endif
@@ -91,7 +95,3 @@ post-install:
 
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
-.endif
diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common
index 275c8d4a203..7ffce6fdfe9 100644
--- a/print/ghostscript-gnu/Makefile.common
+++ b/print/ghostscript-gnu/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2003/09/12 20:07:27 grant Exp $
+# $NetBSD: Makefile.common,v 1.10 2003/09/17 19:41:01 grant Exp $
 
 DISTNAME=	ghostscript-${GS_VERS}
 GS_VERS=	7.05
@@ -42,6 +42,10 @@ PLIST_SRC=		${.CURDIR}/../../print/ghostscript-gnu/PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD=		3.0
+.endif
+
 .if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
 CFLAGS+=		-DA4
 .endif
@@ -81,7 +85,3 @@ post-install:
 
 .include "../../graphics/png/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
-.endif
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index f1be422208b..f6fd91822fb 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2003/09/04 08:27:37 wiz Exp $
+# $NetBSD: Makefile.common,v 1.49 2003/09/17 19:41:03 grant Exp $
 
 DISTNAME=		ghostscript-${GS_VERS}
 GS_VERS=		6.01
@@ -136,8 +136,11 @@ ALL_TARGET=		std
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-.  include "../../mk/gcc.buildlink2.mk"
+GCC_REQD=		2.95.3
+.elif ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD=		3.0
 .endif
+
 .if defined(ZOULARISBASE)
 LDFLAGS+=	-L${ZOULARISBASE}/lib -Wl,${RPATH_FLAG}${ZOULARISBASE}/lib
 .endif
@@ -300,8 +303,3 @@ post-install:
 .include "../../graphics/png/buildlink2.mk"
 .include "../../print/ja-vflib-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=YES
-.  include "../../mk/gcc.buildlink2.mk"
-.endif
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 04d4aff6196..15bca0f3bdf 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:52:29 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/17 19:41:31 grant Exp $
 
 DISTNAME=	hpijs-1.3
 CATEGORIES=	print
@@ -17,7 +17,7 @@ CPPFLAGS+=		-DAPDK_BUFFER_SEND
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-.  include "../../mk/gcc.buildlink2.mk"
+USE_PKGSRC_GCC=		# defined
 .endif
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3