devel/gps: Fix build on SunOS by using COMPILER_RPATH_FLAG

The SunOS linker doesn't understand -rpath, so replace it with
COMPILER_RPATH_FLAG to fix build on SunOS.

Also removing empty directories in the post-install target is not
necessary on pkgsrc.  The SunOS find program doesn't recognize -empty
switch, remove the redundant command to avoid error messages.

3 files changed, 6 insertions, 6 deletions

diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index 848ed5794c9..088ea57534e 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2014/05/05 00:47:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2014/05/09 18:37:34 marino Exp $
 #
 
 DISTNAME=	gps-${GPS_VERSION}
@@ -38,6 +38,7 @@ SUBST_CLASSES+= 	coll python
 SUBST_STAGE.coll=	post-patch
 SUBST_FILES.coll=	gnatlib/src/gnatcoll_readline.gpr.in
 SUBST_SED.coll=		-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.coll+=	-e "s|-rpath|${LINKER_RPATH_FLAG}|g"
 SUBST_STAGE.python=	post-patch
 SUBST_FILES.python=	share/plug-ins/gps_utils/console_process.py
 SUBST_SED.python=	-e "s|/usr/bin/python|${PYTHONBIN}|"
@@ -61,7 +62,6 @@ pre-install:
 post-install:
 	${RM} -rf ${DESTDIR}${PREFIX}/share/doc/gps/html/users_guide/_sources
 	${RM} -rf ${DESTDIR}${PREFIX}/share/doc/gps/html/tutorial/_sources
-	cd ${DESTDIR}${PREFIX}; ${FIND} * -type d -empty -print | xargs rmdir
 
 DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 
diff --git a/devel/gps/distinfo b/devel/gps/distinfo
index 1315de4441d..59a4d546198 100644
--- a/devel/gps/distinfo
+++ b/devel/gps/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2014/05/01 09:00:27 marino Exp $
+$NetBSD: distinfo,v 1.12 2014/05/09 18:37:34 marino Exp $
 
 SHA1 (gps-5.2.1-1-src.tgz) = 5e69d59e2e64a3ec5a35c7fb0cb29d0950e156e7
 RMD160 (gps-5.2.1-1-src.tgz) = 2ca95998ecc5eb7930e0b645cc550e99fe144177
@@ -10,7 +10,7 @@ SHA1 (patch-gnatlib-gnat_src-mlib-utl.adb) = f21bde7ca7e379a11ebbd11bc499ca487d6
 SHA1 (patch-gnatlib_aclocal.m4) = 9dc1e6ee113d2b0e86ddc719dcec6fac634ed4b9
 SHA1 (patch-gnatlib_configure) = b1daedfcd766bf4713464988bb1d7977364e84d2
 SHA1 (patch-gnatlib_gnatcoll__shared.gpr.in) = 4c0d7544ea6adeafce9d2460bf347dfeb09ef286
-SHA1 (patch-gnatlib_src_gnatcoll__readline.gpr.in) = 4a7215eaa7d07674bf781cf21863e5acb0e3f78b
+SHA1 (patch-gnatlib_src_gnatcoll__readline.gpr.in) = 7b79ff229dd52d187d0a496296ba82f3c8f62671
 SHA1 (patch-gps_gps.gpr) = 708943c00a8e35a22ab57d1fc0bf7978e7ed6311
 SHA1 (patch-src__editor_src_src__editor__buffer.adb) = 1bb19152910bc9e779c61503ad00049243930d24
 SHA1 (patch-src__editor_src_src__editor__view.adb) = 3ffb3a1ad3189991716ea807c7106ecac9b02293
diff --git a/devel/gps/patches/patch-gnatlib_src_gnatcoll__readline.gpr.in b/devel/gps/patches/patch-gnatlib_src_gnatcoll__readline.gpr.in
index 7dca58a30a5..c6c4eb5875d 100644
--- a/devel/gps/patches/patch-gnatlib_src_gnatcoll__readline.gpr.in
+++ b/devel/gps/patches/patch-gnatlib_src_gnatcoll__readline.gpr.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-gnatlib_src_gnatcoll__readline.gpr.in,v 1.2 2014/05/01 09:00:27 marino Exp $
+$NetBSD: patch-gnatlib_src_gnatcoll__readline.gpr.in,v 1.3 2014/05/09 18:37:34 marino Exp $
 
 Fix Readline support
 
@@ -18,7 +18,7 @@ Fix Readline support
        --  When linking an executable
        case Gnatcoll_Shared.Readline is
 -         when "yes" => for Linker_Options use ("-lreadline");
-+         when "yes" => for Linker_Options use ("-rpath=@PREFIX@/lib",
++         when "yes" => for Linker_Options use ("-rpath", "@PREFIX@/lib",
 +            "-L@PREFIX@/lib", "-lreadline");
           when "no"  => null;
        end case;