fix package names.

This commit is contained in:
espie 2005-09-11 07:40:58 +00:00
parent 4050e30f04
commit 441579e84b
5 changed files with 21 additions and 25 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2005/09/05 14:55:35 espie Exp $
# $OpenBSD: Makefile,v 1.10 2005/09/11 07:40:58 espie Exp $
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax
V=3.3.6
FULL_VERSION=3.3-20050223
FULL_PKGVERSION=3.3.20050223
MAINTAINER= Marc Espie <espie@openbsd.org>
@ -56,12 +57,6 @@ BUILD_DEPENDS+=:bison-*:devel/bison
DISTNAME= gcc-${FULL_VERSION}
PKGNAME= gcc-${FULL_VERSION}p0
PKGNAME-c++ = g++-${FULL_VERSION}p0
PKGNAME-g77= g77-${FULL_VERSION}p0
PKGNAME-java= gcj-${FULL_VERSION}p0
PKGNAME-objc= gobjc-${FULL_VERSION}p0
PKGNAME-ada= gnat-${FULL_VERSION}p0
DISTFILES= ${DISTNAME}.tar.bz2
@ -162,7 +157,7 @@ PKG_ARGS+=-DPPC=0
.if defined(PACKAGING) && defined(SUBPACKAGE)
. if !empty(SUBPACKAGE) && ${SUBPACKAGE} != "-estdc"
RUN_DEPENDS+=:gcc-${FULL_VERSION}:${PKGPATH}
RUN_DEPENDS+=:gcc-${FULL_PKGVERSION}:${PKGPATH}
. endif
. if ${SUBPACKAGE} == "-c++"
RUN_DEPENDS+=::${PKGPATH},-estdc

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2005/05/16 11:14:36 espie Exp $
# $OpenBSD: Makefile,v 1.7 2005/09/11 07:40:59 espie Exp $
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax
V=3.4.4
FULL_VERSION=3.4-20050401
FULL_PKGVERSION=3.4.20050401
MAINTAINER= Marc Espie <espie@openbsd.org>
@ -58,7 +59,6 @@ BUILD_DEPENDS+=:bison-*:devel/bison
DISTNAME= gcc-${FULL_VERSION}
PKGNAME= gcc-${FULL_VERSION}p0
DISTFILES= ${DISTNAME}.tar.bz2
@ -150,7 +150,7 @@ PKG_ARGS+=-DPPC=0
.if defined(PACKAGING) && defined(SUBPACKAGE)
. if !empty(SUBPACKAGE) && ${SUBPACKAGE} != "-estdc"
RUN_DEPENDS+=::${PKGPATH}
RUN_DEPENDS+=:gcc-${FULL_PKGVERSION}:${PKGPATH}
. endif
. if ${SUBPACKAGE} == "-c++"
RUN_DEPENDS+=::${PKGPATH},-estdc

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.18 2005/08/24 22:54:42 espie Exp $
# $OpenBSD: Makefile,v 1.19 2005/09/11 07:40:59 espie Exp $
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax
V=4.0.2
FULL_VERSION=4.0-20050804
FULL_PKGVERSION=4.0.20050804
MAINTAINER= Marc Espie <espie@openbsd.org>
@ -58,7 +59,6 @@ BUILD_DEPENDS+=:bison-*:devel/bison
DISTNAME= gcc-${FULL_VERSION}
PKGNAME= ${DISTNAME}
DISTFILES= ${DISTNAME}.tar.bz2
@ -169,7 +169,7 @@ PKG_ARGS+=-DPPC=0
SUBPACKAGE?=
.if defined(PACKAGING)
. if !empty(SUBPACKAGE) && ${SUBPACKAGE} != "-estdc"
RUN_DEPENDS+=::${PKGPATH}
RUN_DEPENDS+=:gcc-${FULL_PKGVERSION}:${PKGPATH}
. endif
. if ${SUBPACKAGE} == "-c++"
RUN_DEPENDS+=::${PKGPATH},-estdc

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2005/08/04 14:51:36 espie Exp $
# $OpenBSD: Makefile,v 1.8 2005/09/11 07:40:59 espie Exp $
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax
V=4.1.0
FULL_VERSION=4.1-20050730
FULL_PKGVERSION=4.1.20050730
MAINTAINER= Marc Espie <espie@openbsd.org>
@ -175,7 +176,7 @@ SUBPACKAGE?=
RUN_DEPENDS+=::${PKGPATH}
. endif
. if ${SUBPACKAGE} == "-c++"
RUN_DEPENDS+=::${PKGPATH},-estdc
RUN_DEPENDS+=:gcc-${FULL_PKGVERSION}:${PKGPATH},-estdc
. endif
.endif
.if !defined(PACKAGING) || ${SUBPACKAGE} == "-f95"

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.3 2005/05/16 11:14:36 espie Exp $
# $OpenBSD: Makefile.inc,v 1.4 2005/09/11 07:40:58 espie Exp $
# common stuff for all gcc ports
# we assume each one defines a V variable.
@ -20,14 +20,14 @@ COMMENT-java= ${COM}: java compiler
COMMENT-objc= ${COM}: obj C compiler
COMMENT-ada= ${COM}: Ada compiler
PKGNAME?= gcc-${FULL_VERSION}
PKGNAME-c++ ?= g++-${FULL_VERSION}
PKGNAME-estdc?= libstdc++-${FULL_VERSION}
PKGNAME-g77?= g77-${FULL_VERSION}
PKGNAME-f95?= g95-${FULL_VERSION}
PKGNAME-java?= gcj-${FULL_VERSION}
PKGNAME-objc?= gobjc-${FULL_VERSION}
PKGNAME-ada?= gnat-${FULL_VERSION}
PKGNAME?= gcc-${FULL_PKGVERSION}
PKGNAME-c++ ?= g++-${FULL_PKGVERSION}
PKGNAME-estdc?= libstdc++-${FULL_PKGVERSION}
PKGNAME-g77?= g77-${FULL_PKGVERSION}
PKGNAME-f95?= g95-${FULL_PKGVERSION}
PKGNAME-java?= gcj-${FULL_PKGVERSION}
PKGNAME-objc?= gobjc-${FULL_PKGVERSION}
PKGNAME-ada?= gnat-${FULL_PKGVERSION}
DIST_SUBDIR=gcc
CONFIG=${MACHINE_ARCH}-unknown-openbsd${OSREV}