4 files changed, 74 insertions, 15 deletions

diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index 3c566363fc07..c8f8e101a04c 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gps
 PORTVERSION=	6.1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 PKGNAMESUFFIX=	-ide
@@ -31,6 +31,7 @@ AWKREVDATE=		'/Last Changed Date/ {print "\"s|unknown date|" $$4 "|\""}'
 GPSVER=			GPS_VERSION=${PORTVERSION}
 ALL_TARGET=		default
 NO_MTREE=		yes
+SUB_FILES=		gps
 
 # 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 @@ MAKE_ARGS+=		PYTHON_CMD=${PYTHON_CMD}
 
 .include <bsd.port.options.mk>
 
+SUB_LIST=		ADA_PATH=${PREFIX}/${ADAXX}-aux/bin
+
 .if ${PORT_OPTIONS:MDEBUG}
 MAKE_ARGS+=		Build=Debug
 .else
@@ -113,6 +116,12 @@ post-patch:
 		${WRKSRC}/configure
 	@${AWK} ${AWKREVDATE} ${WRKSRC}/REVISION | ${XARGS} -I sub \
 		${SED} -i.bak -e sub ${WRKSRC}/common/core/src/config.ads.in
+	@${SED} -i '' -e \
+		's|= "gnat"|= "${LOCALBASE}/${ADAXX}-aux/bin/gnat"|' \
+		${WRKSRC}/share/support/core/gps_utils/gnat_rules.py
+	@${REINPLACE_CMD} -e \
+		's|@UTILSHARE@|${LOCALBASE}/share/gnat_util|' \
+		${WRKSRC}/Makefile.in
 
 do-build:
 	@${CP} ${PREFIX}/include/gnat_util/impunit.* ${WRKSRC}/distrib
@@ -126,7 +135,8 @@ do-build:
 post-install:
 	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/users_guide/_sources
 	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/tutorial/_sources
-	echo "This is the GPS GPL Edition for the FreeBSD Ports Collection." \
+	${INSTALL_SCRIPT} ${WRKDIR}/gps ${STAGEDIR}${PREFIX}/bin
+	echo "This is the GPS GPL Edition for the ${OPSYS} Ports Collection." \
 		> ${STAGEDIR}${PREFIX}/share/gps/about.txt
 	${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
 	@(cd ${STAGEDIR}${PREFIX} ; \
diff --git a/devel/gps/files/gps.in b/devel/gps/files/gps.in
new file mode 100644
index 000000000000..3bc4267adc9f
--- /dev/null
+++ b/devel/gps/files/gps.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# GPS wrapper written by John Marino
+# It sets ADA_PROJECT_PATH in environment if unset
+# It also adds the path to the default Ada toolchain if not already present
+#
+
+VIAS=$(echo ${PATH} | /usr/bin/tr ":" " ")
+
+if [ -z "${ADA_PROJECT_PATH}" ]
+then
+	ADA_PROJECT_PATH=%%PREFIX%%/lib/gnat
+	export ADA_PROJECT_PATH
+fi
+
+FOUND=0
+for via in ${VIAS}
+do
+	[ "${via}" = "%%ADA_PATH%%" ] && FOUND=1;
+done;
+
+if [ ${FOUND} -eq 0 ]
+then
+	PATH=${PATH}:%%ADA_PATH%%
+	export PATH;
+fi
+
+exec "%%PREFIX%%/bin/gps_exe" "$@"
diff --git a/devel/gps/files/patch-Makefile.in b/devel/gps/files/patch-Makefile.in
index fb9824a81bba..c538b0ef83d4 100644
--- a/devel/gps/files/patch-Makefile.in
+++ b/devel/gps/files/patch-Makefile.in
@@ -1,14 +1,19 @@
---- Makefile.in.orig	2014-05-23 09:12:18.000000000 +0000
+--- Makefile.in.orig	2014-05-23 17:24:28 UTC
 +++ Makefile.in
-@@ -5,14 +5,14 @@ RMDIR           = rm -rf
+@@ -3,16 +3,15 @@ MV              = mv
+ MKDIR           = mkdir -p
+ RMDIR           = rm -rf
  STRIP           = strip
- AWK             = @AWK@
+-AWK             = @AWK@
++AWK             = /usr/bin/awk
  PERL            = perl
 -PYTHON          = python
+-INSTALL         = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_DATA    = @INSTALL_DATA@
 +PYTHON          = $(PYTHON_CMD)
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
++INSTALL_PROGRAM = $(BSD_INSTALL_PROGRAM)
++INSTALL_DATA    = $(BSD_INSTALL_DATA)
  prefix          = @prefix@
 -bindir          = $(prefix)/bin
 -sharedir        = $(prefix)/share
@@ -19,7 +24,7 @@
  
  all default:
  	$(MAKE) -C gps default
-@@ -49,16 +49,6 @@ ifeq ($(OS),Windows_NT)
+@@ -49,16 +48,6 @@ ifeq ($(OS),Windows_NT)
  		share/plug-ins/_subversion_ \
  		> share/plug-ins/subversion_native_windows.py
  endif
@@ -34,9 +39,9 @@
 -	${RM} ${sharedir}/gps/perspectives.xml
 -	$(RMDIR) $(sharedir)/gps/templates
  # update runtime.xml before copying the plug-ins files.
- 	-(cd distrib; $(PERL) from_impunit.pl)
+ 	(cd distrib; $(PERL) from_impunit.pl)
  # update light icon set
-@@ -71,12 +61,9 @@ ifeq ($(OS),Windows_NT)
+@@ -71,12 +60,11 @@ ifeq ($(OS),Windows_NT)
  	$(MV) share/plug-ins/_subversion_ share/plug-ins/subversion.py
  	$(RM) share/plug-ins/subversion_native_windows.py
  endif
@@ -46,6 +51,17 @@
 -	(cd share; tar cf - library/GPS_old/*.py) | (cd $(sharedir)/gps; tar xf -)
  	(cd share; tar cf - support/) | (cd $(sharedir)/gps; tar xf -)
 -	$(AWK) -f distrib/gnat_switches.awk < gnat/gnat_ugn.texi > $(sharedir)/gps/support/core/gnat_switches.py
++	$(AWK) -f distrib/gnat_switches.awk < @UTILSHARE@/gnat_ugn.texi \
++		> $(sharedir)/gps/support/core/gnat_switches.py
  	$(RM) $(sharedir)/gps/plug-ins/emacs.xml
  	$(RM) $(sharedir)/gps/plug-ins/python_doc.py
  	$(RM) $(sharedir)/gps/plug-ins/python_doc.pyc
+@@ -103,7 +91,7 @@ ifeq ($(OS),Windows_NT)
+ 	$(INSTALL_PROGRAM) gnatlib/src/obj/gnatinspect.exe $(bindir)
+ 	$(MAKE) -C common/expect install
+ else
+-	$(INSTALL_PROGRAM) gps/obj/gps $(bindir)
++	$(INSTALL_PROGRAM) gps/obj/gps $(bindir)/gps_exe
+ 	$(INSTALL_PROGRAM) cli/obj/gnatdoc $(bindir)
+ 	$(INSTALL_PROGRAM) cli/obj/gps_cli $(bindir)
+ 	$(INSTALL_PROGRAM) spark/obj/gnatspark $(bindir)
diff --git a/devel/gps/files/patch-docs_Makefile.in b/devel/gps/files/patch-docs_Makefile.in
index a8a09639079a..64c44b5d574f 100644
--- a/devel/gps/files/patch-docs_Makefile.in
+++ b/devel/gps/files/patch-docs_Makefile.in
@@ -1,6 +1,6 @@
---- docs/Makefile.in.orig	2014-05-23 09:12:23.000000000 +0000
+--- docs/Makefile.in.orig	2014-05-23 09:12:23 UTC
 +++ docs/Makefile.in
-@@ -1,6 +1,6 @@
+@@ -1,10 +1,9 @@
  prefix = @prefix@
 -docdir = $(prefix)/share/doc/gps
 -sharedir = $(prefix)/share/gps
@@ -8,8 +8,13 @@
 +sharedir = $(DESTDIR)$(prefix)/share/gps
  
  MKDIR = mkdir -p
- INSTALL = @INSTALL@
-@@ -12,20 +12,20 @@ all: ug tutorial gps_pg relnotes gnatdoc
+-INSTALL = @INSTALL@
+-INSTALL_DATA = @INSTALL_DATA@
++INSTALL_DATA = $(BSD_INSTALL_DATA)
+ CONVERT = convert
+ CP = cp -p
+ 
+@@ -12,20 +11,20 @@ all: ug tutorial gps_pg relnotes gnatdoc
  static:
  
  gps_pg: