svn commit: r341080 - head/lang/gcc44
Gerald Pfeifer
gerald at FreeBSD.org
Sat Jan 25 19:34:27 UTC 2014
Author: gerald
Date: Sat Jan 25 19:34:26 2014
New Revision: 341080
URL: http://svnweb.freebsd.org/changeset/ports/341080
QAT: https://qat.redports.org/buildarchive/r341080/
Log:
Update deprecation message now that no other port depends on gcc44 any more.
Still convert to staging, remove a no longer necessary dependency on bison
and backport some other changes (variable naming,...) from lang/gcc46 in
case someone wants or needs to retain this port locally after we remove it
here.
Modified:
head/lang/gcc44/Makefile
head/lang/gcc44/pkg-plist
Modified: head/lang/gcc44/Makefile
==============================================================================
--- head/lang/gcc44/Makefile Sat Jan 25 19:32:14 2014 (r341079)
+++ head/lang/gcc44/Makefile Sat Jan 25 19:34:26 2014 (r341080)
@@ -6,7 +6,7 @@ PORTVERSION= 4.4.7
PORTEPOCH= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= releases/gcc-${VERSIONSTRING}
+MASTER_SITE_SUBDIR= releases/gcc-${DISTVERSION}
DISTNAME= gcc-${DISTVERSION}
MAINTAINER= gerald at FreeBSD.org
@@ -16,13 +16,16 @@ LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/
libmpfr.so:${PORTSDIR}/math/mpfr
RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-DEPRECATED= Superseded by GCC 4.6, only kept for the sake of cad/salome
+DEPRECATED= Superseded by GCC 4.6
-VERSIONSTRING= ${PORTVERSION}
+# 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/}
ONLY_FOR_ARCHS= amd64 i386 sparc64
USE_BINUTILS= yes
-USES= bison gmake iconv perl5
+USES= gmake iconv perl5
USE_BZIP2= yes
USE_PERL5= build
SSP_UNSAFE= yes
@@ -30,7 +33,6 @@ SSP_UNSAFE= yes
PATCH_WRKSRC= ${SRCDIR}
CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
@@ -39,7 +41,7 @@ CONFIGURE_TARGET= x86_64-portbld-${OPSYS
CONFIGURE_TARGET= ${ARCH}-portbld-${OPSYS:L}${OSREL}
.endif
-SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
+SRCDIR= ${WRKDIR}/gcc-${DISTVERSION}
WRKSRC= ${WRKDIR}/build
TARGLIB= ${PREFIX}/lib/gcc${SUFFIX}
LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX}
@@ -61,14 +63,9 @@ CONFIGURE_ARGS+=--disable-bootstrap \
--with-system-zlib
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
USE_LDCONFIG= ${TARGLIB}
-PLIST_SUB= GCC_VER=${PORTVERSION} \
+PLIST_SUB= GCC_VERSION=${GCC_VERSION} \
GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
-MAN1= cpp${SUFFIX}.1 \
- g++${SUFFIX}.1 \
- gcc${SUFFIX}.1 \
- gcov${SUFFIX}.1 \
- gfortran${SUFFIX}.1
INFO= gcc${SUFFIX}/cpp \
gcc${SUFFIX}/cppinternals \
gcc${SUFFIX}/gcc \
@@ -86,13 +83,11 @@ pre-configure:
@${MKDIR} ${CONFIGURE_WRKSRC}
post-install:
- ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
- ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
- ${RM} -f ${TARGLIB}/*.la
+ ${RM} -f ${STAGEDIR}${TARGLIB}/*.la
# Add target libraries and include files to packaging list.
${RM} -f ${WRKDIR}/PLIST.lib
.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
- cd ${PREFIX} ; if [ -d $d ]; then \
+ cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
${FIND} $d -type d | ${SORT} -r \
| ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
Modified: head/lang/gcc44/pkg-plist
==============================================================================
--- head/lang/gcc44/pkg-plist Sat Jan 25 19:32:14 2014 (r341079)
+++ head/lang/gcc44/pkg-plist Sat Jan 25 19:34:26 2014 (r341080)
@@ -1,7 +1,7 @@
bin/%%GNU_HOST%%-c++%%SUFFIX%%
bin/%%GNU_HOST%%-g++%%SUFFIX%%
bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
+bin/%%GNU_HOST%%-gcc-%%GCC_VERSION%%
bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
bin/c++%%SUFFIX%%
bin/cpp%%SUFFIX%%
@@ -11,4 +11,9 @@ bin/gccbug%%SUFFIX%%
bin/gcov%%SUFFIX%%
bin/gfortran%%SUFFIX%%
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
@comment Insert PLIST.lib here
More information about the svn-ports-all
mailing list