3 files changed, 15 insertions, 34 deletions
diff --git a/devel/abi-compliance-checker/Makefile b/devel/abi-compliance-checker/Makefile
index 0dfdeb5fe86f..a4a9f6b75547 100644
--- a/devel/abi-compliance-checker/Makefile
+++ b/devel/abi-compliance-checker/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	abi-compliance-checker
-PORTVERSION=	1.13
+PORTVERSION=	1.15
 CATEGORIES=	devel perl5
-MASTER_SITES=	http://ispras.linux-foundation.org/images/b/ba/
+MASTER_SITES=	http://ispras.linux-foundation.org/images/3/32/
 DISTFILES=	${PORTNAME:S/^a/A/}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	bf1783@gmail.com
 COMMENT=	Checks binary compatibility of two versions of a C/C++ shared library
 
-RUN_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
-
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
 
@@ -25,10 +23,16 @@ CPPFILT?=	c++filt
 READELF?=	readelf
 
 post-patch:
-	${REINPLACE_CMD} -e "s|c++filt|${CPPFILT}|g" \
-		-e "s|readelf|${READELF}|g" -e "s|g++|${CXX}|g" \
-		-e "s|\"gcc|\"${CC}|g" -e "s|-shared|& -fPIC|g" \
-		-e "s|gsed|${LOCALBASE}/bin/gsed|g" \
+	${REINPLACE_CMD} \
+		-e "\%my% { \
+			s%\"c++filt\"%\"${CPPFILT}\"%g; \
+			s%\"readelf\"%\"${READELF}\"%g; \
+			s%\"g++\"%\"${CXX}\"%g; \
+			s%\"gcc\"%\"${CC}\"%g; }" \
+		-e "\%search_for% { \
+			s%\"g++\"%\"${CXX}\"%g; \
+			s%\"gcc\"%\"${CC}\"%g; }" \
+		-e "s%-shared%& -fPIC%g" \
 		${WRKSRC}/${PORTNAME}.pl
 
 do-install:
diff --git a/devel/abi-compliance-checker/distinfo b/devel/abi-compliance-checker/distinfo
index 734ae6485355..53ba4fd04b55 100644
--- a/devel/abi-compliance-checker/distinfo
+++ b/devel/abi-compliance-checker/distinfo
@@ -1,3 +1,3 @@
-MD5 (Abi-compliance-checker-1.13.tar.gz) = 9c21a3dae0cfbc5ea2c3636551a52b49
-SHA256 (Abi-compliance-checker-1.13.tar.gz) = a2bb611b24754c7e0b3ea406911f79ed6c8b12e07a719f83b5d0740aef3efba3
-SIZE (Abi-compliance-checker-1.13.tar.gz) = 51118
+MD5 (Abi-compliance-checker-1.15.tar.gz) = de424737248f7543a872ccb51e129860
+SHA256 (Abi-compliance-checker-1.15.tar.gz) = 63c6e1bdb4421c93d093fe5265b5be3170eddbb98ac62832511f5b425e0ecfce
+SIZE (Abi-compliance-checker-1.15.tar.gz) = 62910
diff --git a/devel/abi-compliance-checker/files/patch-abi-compliance-checker.pl b/devel/abi-compliance-checker/files/patch-abi-compliance-checker.pl
deleted file mode 100644
index 6f35ed330584..000000000000
--- a/devel/abi-compliance-checker/files/patch-abi-compliance-checker.pl
+++ /dev/null
@@ -1,23 +0,0 @@
---- abi-compliance-checker.pl.orig	2010-02-16 07:13:09.000000000 -0500
-+++ abi-compliance-checker.pl	2010-02-17 13:20:46.000000000 -0500
-@@ -481,7 +481,7 @@
-     return if(not $InfoPath or not -f $InfoPath);
-     my $InfoPath_New = $InfoPath.".1";
-     #my $Keywords = join("\\|", keys(%check_node));#|grep "$Keywords"
--    system("sed ':a;N;\$!ba;s/\\n[^\@]//g' ".esc($InfoPath)."|sed 's/ [ ]\\+/  /g' > ".esc($InfoPath_New));
-+    system("gsed ':a;N;\$!ba;s/\\n[^\@]//g' ".esc($InfoPath)."|gsed 's/ [ ]\\+/  /g' > ".esc($InfoPath_New));
-     system("rm", "-fr", $InfoPath);
-     #getting info
-     open(INFO, $InfoPath_New) || die ("can't open file '\$InfoPath_New\': $!\n");
-@@ -7123,9 +7123,9 @@
- 
- sub get_solib_default_paths()
- {
--    foreach my $Line (split("\n", `ldconfig -p`))
-+    foreach my $Line (split("\n", `ldconfig -r`))
-     {
--        if($Line=~/\A[ \t]*([^ \t]+) .* \=\> (.+)\Z/)
-+        if($Line=~/\A\t[0-9]*:(.+) \=\> (.+)\Z/)
-         {
-             $SoLib_DefaultPath{$1} = $2;
-         }