svn commit: r347968 - in head/devel/gps: . files

[John Marino]

Author: marino
Date: Wed Mar 12 10:20:29 2014
New Revision: 347968
URL: http://svnweb.freebsd.org/changeset/ports/347968
QAT: https://qat.redports.org/buildarchive/r347968/

Log:
  devel/gps: Fix build on upcoming gcc49
  
  This port has to be bumped for two reasons:
    1) It should have been built in production mode across the board.
       There are some style check failures that appear in "debug" mode
       due to gcc49 checks being more strict that gcc47 checks.  Those
       issues aren't fixed, but simply hidden by switching to production
       which was desired anyway.
    2) The project logic was looking for "gnatgcc", a leftover from the
       gnat-aux days.  The gcc-aux compilers call their drivers "gcc" as
       expected by gps.  This removes the patch for gnatgcc since the
       original code is correct.

Deleted:
  head/devel/gps/files/patch-gnatlib-gnat_src-mlib-utl.adb
Modified:
  head/devel/gps/Makefile

Modified: head/devel/gps/Makefile
==============================================================================
--- head/devel/gps/Makefile	Wed Mar 12 10:04:11 2014	(r347967)
+++ head/devel/gps/Makefile	Wed Mar 12 10:20:29 2014	(r347968)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gps
 PORTVERSION=	5.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	gps-5.2.1-1-src
@@ -31,6 +31,7 @@ WRKSRC=			${WRKDIR}/gps-release-ide-${PO
 
 CONFIGURE_ENV+=		AWK=/usr/bin/awk
 MAKE_ENV+=		PROCESSORS=${MAKE_JOBS_NUMBER}
+MAKE_ARGS+=		Build=Production
 
 OPTIONS_DEFINE=		SYSLOG SQLITE PGSQL PYTHON READLINE
 OPTIONS_DEFAULT=	SYSLOG SQLITE PYTHON READLINE
@@ -103,7 +104,7 @@ post-patch:
 	    ${WRKSRC}/gnatlib/src/gnatcoll_readline.gpr.in
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} default
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} default
 
 pre-install:
 .if ${PORT_OPTIONS:MPYTHON}
@@ -116,7 +117,7 @@ post-install:
 	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/tutorial/_sources
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty -print | ${XARGS} ${RMDIR}
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
-	   ${SORT} > ${TMPPLIST}
+	   ${SORT} >> ${TMPPLIST}
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \
 	   ${SED} -e '/share\/doc$$/d' -e '/share\/gps$$/d' \
 	   -e '/share\/gps\/plug-ins$$/d' -e '/share\/examples$$/d' \