Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Aug 2018 02:49:34 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r476485 - in head/graphics/IPA: . files
Message-ID:  <201808060249.w762nYj1043675@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhale
Date: Mon Aug  6 02:49:34 2018
New Revision: 476485
URL: https://svnweb.freebsd.org/changeset/ports/476485

Log:
  Fix build with Perl >= 5.26 - regular expression match was failing with
  newer MakeMaker which caused the objects to be written to the wrong location
  
  Add LICENSE - the README says it is licensed the same as Perl
  
  MFH:		2018Q3 (blanket - build fix)

Added:
  head/graphics/IPA/files/
  head/graphics/IPA/files/patch-Makefile.PL   (contents, props changed)
Modified:
  head/graphics/IPA/Makefile

Modified: head/graphics/IPA/Makefile
==============================================================================
--- head/graphics/IPA/Makefile	Mon Aug  6 02:44:18 2018	(r476484)
+++ head/graphics/IPA/Makefile	Mon Aug  6 02:49:34 2018	(r476485)
@@ -10,6 +10,9 @@ MASTER_SITES=	http://www.prima.eu.org/IPA/ CPAN/Prima/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image Processing Algorithms
 
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Prima>1.24:x11-toolkits/p5-Prima
 
@@ -21,10 +24,4 @@ MAKE_JOBS_UNSAFE=	yes
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/IPA/IPA.so
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} >= 502600
-BROKEN=		Does not build
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/graphics/IPA/files/patch-Makefile.PL
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/IPA/files/patch-Makefile.PL	Mon Aug  6 02:49:34 2018	(r476485)
@@ -0,0 +1,16 @@
+Fix regular expression match and build with MakeMaker >= 7.05_05 which adds a
+space between the target name and the operator.
+
+--- Makefile.PL.orig	2011-05-14 06:27:26 UTC
++++ Makefile.PL
+@@ -79,8 +79,8 @@ H
+ sub c_o
+ {
+ 	my $t = shift-> SUPER::c_o(@_);
+-	unless ( $t =~ /.c\$\(OBJ_EXT\):\n\t.*\$\*\$\(OBJ_EXT\)/ ) {
+-		$t =~ s/(\.c\$\(OBJ_EXT\):\n\t.*)/$1 $co\$*\$(OBJ_EXT)/;
++	unless ( $t =~ /\.c\$\(OBJ_EXT\)\s*:\n\t.*\Q\$\*\$\(OBJ_EXT\)\E/ ) {
++		$t =~ s/(\.c\$\(OBJ_EXT\)\s*:\n\t.*)/$1 $co\$*\$(OBJ_EXT)/;
+ 	}
+ 	return $t;
+ }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808060249.w762nYj1043675>