[Midnightbsd-cvs] mports [23336] trunk/lang/gcc: use symlink

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu May 3 09:36:04 EDT 2018


Revision: 23336
          http://svnweb.midnightbsd.org/mports/?rev=23336
Author:   laffer1
Date:     2018-05-03 09:36:03 -0400 (Thu, 03 May 2018)
Log Message:
-----------
use symlink

Modified Paths:
--------------
    trunk/lang/gcc/Makefile
    trunk/lang/gcc/pkg-descr

Removed Paths:
-------------
    trunk/lang/gcc/distinfo
    trunk/lang/gcc/files/
    trunk/lang/gcc/pkg-plist

Modified: trunk/lang/gcc/Makefile
===================================================================
--- trunk/lang/gcc/Makefile	2018-05-03 13:35:53 UTC (rev 23335)
+++ trunk/lang/gcc/Makefile	2018-05-03 13:36:03 UTC (rev 23336)
@@ -1,141 +1,29 @@
-# $FreeBSD: head/lang/gcc/Makefile 385140 2015-05-01 18:54:47Z gerald $
 # $MidnightBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	4.8.5
-CATEGORIES=	lang java
-MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
+PORTVERSION=	${GCC_DEFAULT}
+PORTREVISION=	1
+CATEGORIES=	lang
+MASTER_SITES=	# not applicable
+DISTFILES=	# not applicable
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	GNU Compiler Collection 4.8
+COMMENT=	Meta-port for the default version of the GNU Compiler Collection
 
-LICENSE=	gpl3
+LICENSE=	other
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+# Once GCC 4.9 and 4.8 aren't options any longer, we can simply use
+# GCC_DEFAULT again below (the expression rewrites 4.9 to 49).
+RUN_DEPENDS=	gcc${GCC_DEFAULT:S/.//}:lang/gcc${GCC_DEFAULT:S/.//}
 
-.if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
-.endif
+NO_ARCH=	yes
+NO_BUILD=	yes
 
-CONFLICTS=	gcc48*
-CPE_VENDOR=	gnu
+PLIST_FILES=	bin/g++ bin/gcc bin/gfortran
 
-# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
-# of executables and directories once installed.
-DISTVERSION=	${PORTVERSION}
-GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
-SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
-USES=		cpe gmake iconv libtool makeinfo perl5 tar:bzip2
-USE_BINUTILS=	yes
-USE_PERL5=	build
-SSP_UNSAFE=	yes
-
-PATCH_WRKSRC=	${SRCDIR}
-CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
-
-OPTIONS_DEFINE=		BOOTSTRAP
-OPTIONS_DEFINE_i386=	JAVA
-OPTIONS_DEFINE_amd64=	JAVA
-OPTIONS_DEFAULT_i386=	JAVA
-OPTIONS_DEFAULT_amd64=	JAVA
-BOOTSTRAP_DESC=		Build using a full bootstrap
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-freebsd9.1
-.else
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd9.1
-.endif
-
-LANGUAGES:=	c,c++,objc,fortran
-SRCDIR=		${WRKDIR}/gcc-${DISTVERSION}
-WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
-LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
-GNU_CONFIGURE=	yes
-.if empty(PORT_OPTIONS:MBOOTSTRAP)
-CONFIGURE_ARGS+=--disable-bootstrap
-.else
-CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
-ALL_TARGET=	bootstrap-lean
-.endif
-CONFIGURE_ARGS+=--disable-nls \
-		--enable-gnu-indirect-function \
-		--libdir=${TARGLIB} \
-		--libexecdir=${LIBEXEC} \
-		--program-suffix=${SUFFIX} \
-		--with-as=${LOCALBASE}/bin/as \
-		--with-gmp=${LOCALBASE} \
-		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
-		--with-ld=${LOCALBASE}/bin/ld \
-		${ICONV_CONFIGURE_ARG} \
-		--with-pkgversion="MidnightBSD Ports Collection" \
-		--with-system-zlib
-MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
-USE_LDCONFIG=	${TARGLIB}
-PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
-		GNU_HOST=${CONFIGURE_TARGET} \
-		SUFFIX=${SUFFIX}
-INFO=		gcc${SUFFIX}/cpp \
-		gcc${SUFFIX}/cppinternals \
-		gcc${SUFFIX}/gcc \
-		gcc${SUFFIX}/gccinstall \
-		gcc${SUFFIX}/gccint \
-		gcc${SUFFIX}/gfortran \
-		gcc${SUFFIX}/libgomp
-# Release tarballs (as opposed to snapshots) always carry this.
-INFO+=		gcc${SUFFIX}/libquadmath \
-		gcc${SUFFIX}/libitm
-SUB_FILES=	pkg-message
-SUB_LIST+=	TARGLIB=${TARGLIB}
-
-.if ${PORT_OPTIONS:MJAVA}
-ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
-BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
-EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
-CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
-LANGUAGES:=	${LANGUAGES},java
-INFO+=		gcc${SUFFIX}/cp-tools \
-		gcc${SUFFIX}/gcj
-PLIST_SUB+=	JAVA=""
-.else
-CONFIGURE_ARGS+=--disable-libgcj
-PLIST_SUB+=	JAVA="@comment "
-.endif
-CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
-
-pre-everything::
-	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
-
-pre-configure:
-	cd ${SRCDIR} ; contrib/gcc_update --touch
-	@${RM} -f ${SRCDIR}/gcc/*/*.info*
-	@${MKDIR} ${CONFIGURE_WRKSRC}
-
-.if defined(MAINTAINER_MODE)
-full-regression-test: build
-	cd ${WRKSRC}; ${MAKE_CMD} -sk check \
-	; ${SRCDIR}/contrib/test_summary
-.endif
-
-post-install:
-	${RM} -f ${PREFIX}/man/man7/*
-	${RM} -f ${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
-	         ${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
-	# Add target libraries and include files to packaging list.
-	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
-	cd ${PREFIX} ; if [ -d $d ]; then \
-	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
-	fi
+do-install:
+.for c in gfortran g++ gcc
+	    ${LN} -s ${c}${GCC_DEFAULT} ${STAGEDIR}${PREFIX}/bin/${c}
 .endfor
-	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Deleted: trunk/lang/gcc/distinfo
===================================================================
--- trunk/lang/gcc/distinfo	2018-05-03 13:35:53 UTC (rev 23335)
+++ trunk/lang/gcc/distinfo	2018-05-03 13:36:03 UTC (rev 23336)
@@ -1,2 +0,0 @@
-SHA256 (gcc-4.8.5.tar.bz2) = 22fb1e7e0f68a63cee631d85b20461d1ea6bda162f03096350e38c8d427ecf23
-SIZE (gcc-4.8.5.tar.bz2) = 86165587

Modified: trunk/lang/gcc/pkg-descr
===================================================================
--- trunk/lang/gcc/pkg-descr	2018-05-03 13:35:53 UTC (rev 23335)
+++ trunk/lang/gcc/pkg-descr	2018-05-03 13:36:03 UTC (rev 23336)
@@ -1,10 +1,7 @@
 GCC, the GNU Compiler Collection, supports a number of languages.  This
-port installs the C, C++, Fortran and Java front ends as gcc48, g++48,
-gfortran48, and gcj48, respectively.
+port pulls in gcc5 (or another version-specific port) and defines symlinks
+called gcc, g++, and gfortran.
 
-It can be used interchangibly with the lang/gcc48 port which tracks
-weekly upstream snapshots whereas this port will be updated less
-frequently, mostly in sync with upstream releases, and will move to
-lang/gcc49 and later over time.
+WWW: https://gcc.gnu.org
 
-WWW: http://gcc.gnu.org/
+Gerald Pfeifer <gerald at FreeBSD.org>

Deleted: trunk/lang/gcc/pkg-plist
===================================================================
--- trunk/lang/gcc/pkg-plist	2018-05-03 13:35:53 UTC (rev 23335)
+++ trunk/lang/gcc/pkg-plist	2018-05-03 13:36:03 UTC (rev 23336)
@@ -1,76 +0,0 @@
-bin/%%GNU_HOST%%-c++%%SUFFIX%%
-bin/%%GNU_HOST%%-g++%%SUFFIX%%
-bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/%%GNU_HOST%%-gcc-%%GCC_VERSION%%
-bin/%%GNU_HOST%%-gcc-ar%%SUFFIX%%
-bin/%%GNU_HOST%%-gcc-nm%%SUFFIX%%
-bin/%%GNU_HOST%%-gcc-ranlib%%SUFFIX%%
-bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
-bin/c++%%SUFFIX%%
-bin/cpp%%SUFFIX%%
-bin/g++%%SUFFIX%%
-bin/gcc%%SUFFIX%%
-bin/gcc-ar%%SUFFIX%%
-bin/gcc-nm%%SUFFIX%%
-bin/gcc-ranlib%%SUFFIX%%
-bin/gcov%%SUFFIX%%
-bin/gfortran%%SUFFIX%%
- at comment info/gcc%%SUFFIX%%/dir
-man/man1/cpp%%SUFFIX%%.1.gz
-man/man1/g++%%SUFFIX%%.1.gz
-man/man1/gcc%%SUFFIX%%.1.gz
-man/man1/gcov%%SUFFIX%%.1.gz
-man/man1/gfortran%%SUFFIX%%.1.gz
-%%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/aotcompile.py
-%%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/classfile.py
-share/gcc-%%GCC_VERSION%%/python/libstdcxx/__init__.py
-share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/__init__.py
-share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py
-%%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
-%%JAVA%%bin/aot-compile%%SUFFIX%%
-%%JAVA%%bin/gappletviewer%%SUFFIX%%
-%%JAVA%%bin/gc-analyze%%SUFFIX%%
-%%JAVA%%bin/gcj%%SUFFIX%%
-%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
-%%JAVA%%bin/gcjh%%SUFFIX%%
-%%JAVA%%bin/gij%%SUFFIX%%
-%%JAVA%%bin/gjar%%SUFFIX%%
-%%JAVA%%bin/gjarsigner%%SUFFIX%%
-%%JAVA%%bin/gjavah%%SUFFIX%%
-%%JAVA%%bin/gkeytool%%SUFFIX%%
-%%JAVA%%bin/gnative2ascii%%SUFFIX%%
-%%JAVA%%bin/gorbd%%SUFFIX%%
-%%JAVA%%bin/grmic%%SUFFIX%%
-%%JAVA%%bin/grmid%%SUFFIX%%
-%%JAVA%%bin/grmiregistry%%SUFFIX%%
-%%JAVA%%bin/gserialver%%SUFFIX%%
-%%JAVA%%bin/gtnameserv%%SUFFIX%%
-%%JAVA%%bin/jcf-dump%%SUFFIX%%
-%%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%libdata/pkgconfig/libgcj-4.8.pc
-%%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gc-analyze%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gcj%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gcj-dbtool%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gcjh%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gij%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gjar%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gjarsigner%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gjavah%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gjdoc%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gkeytool%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gnative2ascii%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gorbd%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/grmic%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/grmid%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/grmiregistry%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gserialver%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/gtnameserv%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/jcf-dump%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/jv-convert%%SUFFIX%%.1.gz
-%%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar
-%%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar
- at exec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
- at unexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
- at comment Insert PLIST.lib here



More information about the Midnightbsd-cvs mailing list