rename MODGCC{3,4}_ARCHES to MODGCC{3,4}_ARCHS, suggested by naddy,

phessler and jasper agree
This commit is contained in:
sthen 2011-11-17 18:03:43 +00:00
parent e8b4473500
commit 5749b5be10
7 changed files with 23 additions and 22 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: mk.conf.template,v 1.3 2011/11/17 14:32:24 sthen Exp $
# $OpenBSD: mk.conf.template,v 1.4 2011/11/17 18:03:43 sthen Exp $
# This file contains some mk.conf entries suitable for ports work.
#
@ -21,7 +21,8 @@
.poison DISTFLIES
.poison LIB_DEPEND
.poison MASTER_SITE_SOURCEFORGET
.poison MODGCC4_ARCHS
.poison MODGCC3_ARCHES
.poison MODGCC4_ARCHES
.poison MODPY_BUILDEP
.poison MODULE
.poison NOT_FOR_ARCH

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.26 2011/10/29 08:12:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.27 2011/11/17 18:03:43 sthen Exp $
# uses gcj which is only supported on select archs
ONLY_FOR_ARCHS= i386 amd64 sparc64
@ -28,7 +28,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= devel/gettext gcc4
MODGCC4_ARCHES= *
MODGCC4_ARCHS= *
MODGCC4_LANGS= java
USE_GROFF = Yes

View File

@ -1,6 +1,6 @@
# $OpenBSD: gcc3.port.mk,v 1.7 2011/03/26 19:13:28 naddy Exp $
# $OpenBSD: gcc3.port.mk,v 1.8 2011/11/17 18:03:43 sthen Exp $
MODGCC3_ARCHES?=
MODGCC3_ARCHS?=
# Supported languages for now
_MODGCC3CC= cc
_MODGCC3CXX= c++
@ -8,8 +8,8 @@ _MODGCC3G77= g77
# Always include support for this
MODGCC3_LANGS+= ${_MODGCC3CC}
.if ${MODGCC3_ARCHES:L} != ""
. for _i in ${MODGCC3_ARCHES}
.if ${MODGCC3_ARCHS:L} != ""
. for _i in ${MODGCC3_ARCHS}
. if !empty(MACHINE_ARCH:M${_i})
BUILD_DEPENDS+= gcc->=3.3,<3.4|gcc->=3.3v0,<3.4v0:lang/gcc/3.3
. for _j in ${MODGCC3_LANGS:L}

View File

@ -1,6 +1,6 @@
# $OpenBSD: gcc4.port.mk,v 1.14 2011/09/15 17:25:35 espie Exp $
# $OpenBSD: gcc4.port.mk,v 1.15 2011/11/17 18:03:43 sthen Exp $
MODGCC4_ARCHES?=
MODGCC4_ARCHS?=
MODGCC4_LANGS?=
@ -19,8 +19,8 @@ ERRORS += "Fatal: unknown language ${_l}"
_MODGCC4_ARCH_USES = No
.if ${MODGCC4_ARCHES:L} != ""
. for _i in ${MODGCC4_ARCHES}
.if ${MODGCC4_ARCHS:L} != ""
. for _i in ${MODGCC4_ARCHS}
. if !empty(MACHINE_ARCH:M${_i})
_MODGCC4_ARCH_USES = Yes
. endif

View File

@ -1,6 +1,6 @@
# $OpenBSD: gcc4.port.mk,v 1.1.1.1 2007/03/17 22:35:25 espie Exp $
# $OpenBSD: gcc4.port.mk,v 1.2 2011/11/17 18:03:43 sthen Exp $
MODGCC4_ARCHES?=
MODGCC4_ARCHS?=
# Supported languages for now
_MODGCC4CC= cc
_MODGCC4CXX= c++
@ -8,8 +8,8 @@ _MODGCC4G77= g77
# Always include support for this
MODGCC4_LANGS+= ${_MODGCC4CC}
.if ${MODGCC4_ARCHES:L} != ""
. for _i in ${MODGCC4_ARCHES}
.if ${MODGCC4_ARCHS:L} != ""
. for _i in ${MODGCC4_ARCHS}
. if !empty(MACHINE_ARCH:M${_i})
BUILD_DEPENDS+= ::lang/gcc/4.2
. for _j in ${MODGCC4_LANGS:L}

View File

@ -1,6 +1,6 @@
# $OpenBSD: gcc4.port.mk,v 1.1.1.1 2011/11/14 13:00:55 pascal Exp $
# $OpenBSD: gcc4.port.mk,v 1.2 2011/11/17 18:03:43 sthen Exp $
MODGCC4_ARCHES?=
MODGCC4_ARCHS?=
MODGCC4_LANGS?=
@ -19,8 +19,8 @@ ERRORS += "Fatal: unknown language ${_l}"
_MODGCC4_ARCH_USES = No
.if ${MODGCC4_ARCHES:L} != ""
. for _i in ${MODGCC4_ARCHES}
.if ${MODGCC4_ARCHS:L} != ""
. for _i in ${MODGCC4_ARCHS}
. if !empty(MACHINE_ARCH:M${_i})
_MODGCC4_ARCH_USES = Yes
. endif

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2011/09/10 13:39:48 armani Exp $
# $OpenBSD: Makefile,v 1.4 2011/11/17 18:03:43 sthen Exp $
COMMENT= pdf swiss army knife
VERSION= 1.44
@ -20,7 +20,7 @@ WANTLIB += ${MODGCC4_GCJWANTLIB} c m pthread z
MASTER_SITES= http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/
MODULES= converters/libiconv gcc4
MODGCC4_ARCHES= *
MODGCC4_ARCHS= *
MODGCC4_LANGS= java c++
LIB_DEPENDS= ${MODGCC4_GCJLIBDEP}