svn commit: r397330 - head/devel/gps

[John Marino]

Author: marino
Date: Sat Sep 19 15:06:51 2015
New Revision: 397330
URL: https://svnweb.freebsd.org/changeset/ports/397330

Log:
  devel/gps: Unbreak build after GDB update
  
  The GDB version was hardcoded which was a bad idea.  Update the makefile
  to dynamically determine the current version of GDB for the PORTGDB
  definition.  While here, update RUN_DEPENDS to include gprbuild which is
  a fix that I've held on to for a while.  Also, gnat_util is no longer
  needed to build GPS so remove that dependency as well.
  
  Reported by:	pkg-fallout

Modified:
  head/devel/gps/Makefile

Modified: head/devel/gps/Makefile
==============================================================================
--- head/devel/gps/Makefile	Sat Sep 19 14:47:52 2015	(r397329)
+++ head/devel/gps/Makefile	Sat Sep 19 15:06:51 2015	(r397330)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gps
 PORTVERSION=	6.1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	gps-6.1.1-src
@@ -13,8 +14,7 @@ COMMENT=	GNAT Programming Studio - IDE f
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gprbuild>=20140417:${PORTSDIR}/devel/gprbuild \
-		gnat_util>=20140422_2:${PORTSDIR}/lang/gnat_util \
+BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild \
 		xmlada>=4.4:${PORTSDIR}/textproc/xmlada \
 		gnatcoll>=2015:${PORTSDIR}/devel/gnatcoll \
 		templates_parser>11:${PORTSDIR}/textproc/templates_parser
@@ -22,6 +22,7 @@ LIB_DEPENDS=	libgtkada.so:${PORTSDIR}/x1
 RUN_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
 		gnatinspect:${PORTSDIR}/devel/gnatcoll \
 		gdb${PORTGDB}:${PORTSDIR}/devel/gdb \
+		gprbuild:${PORTSDIR}/devel/gprbuild \
 		${PYTHON_PKGNAMEPREFIX}pep8>0:${PORTSDIR}/devel/pep8 \
 		${PYTHON_PKGNAMEPREFIX}jedi>0:${PORTSDIR}/devel/py-jedi
 
@@ -35,7 +36,7 @@ GPSVER=		GPS_VERSION=${PORTVERSION}
 ALL_TARGET=	default
 NO_MTREE=	yes
 SUB_FILES=	gps
-PORTGDB=	791
+PORTGDB=	${GDBVER:S/.//}
 
 # note: librsvg2 is needed to display the svg icons in the menu.  Actually
 # needed is lib/gdk-pixbuf-2.0/%%GTK2_VER%%/loaders/libpixbufloader-svg.so ,
@@ -58,6 +59,8 @@ PORTEXAMPLES=		demo python remote tutori
 .include <bsd.port.options.mk>
 
 SUB_LIST=		ADA_PATH=${PREFIX}/${ADAXX}-aux/bin
+GDBVER!=		${GREP} ^PORTVERSION ${.CURDIR}/../gdb/Makefile | \
+			${AWK} '{print $$2}'
 
 .if ${PORT_OPTIONS:MDEBUG}
 MAKE_ARGS+=		Build=Debug