Index: head/databases/p5-Memcached-libmemcached/Makefile =================================================================== --- head/databases/p5-Memcached-libmemcached/Makefile (revision 391018) +++ head/databases/p5-Memcached-libmemcached/Makefile (revision 391019) @@ -1,32 +1,32 @@ # Created by: Cheng-Lung Sung # $FreeBSD$ PORTNAME= Memcached-libmemcached PORTVERSION= 1.001801 +PORTREVISION= 1 CATEGORIES= databases devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= swills@FreeBSD.org COMMENT= Thin fast full interface to the libmemcached client API LIB_DEPENDS= libmemcached.so:${PORTSDIR}/databases/libmemcached USES= perl5 USE_PERL5= configure USE_LDCONFIG= yes post-extract: @${RM} -r ${WRKDIR}/src +post-patch: + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile.PL + .include -.if ${OPSYS} == FreeBSD -.if ${OSVERSION} > 1000000 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.PL-10 -.else -EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.PL-9 -.endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.PL .endif .include Index: head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-10 =================================================================== --- head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-10 (revision 391018) +++ head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-10 (nonexistent) @@ -1,29 +0,0 @@ ---- Makefile.PL.orig 2015-05-07 17:56:22 UTC -+++ Makefile.PL -@@ -30,7 +30,7 @@ $Data::Dumper::Indent = 1; - $Data::Dumper::Sortkeys = 1; - - my $lmcd_api_ver = "1.0"; # eg $lmcd_src/libmemcached-$lmcd_api_ver/ --my $lmcd_inst = getcwd()."/src_inst"; -+my $lmcd_inst = "/usr/local"; - my $lmcd_built_lib = "$lmcd_inst/lib/libmemcached$Config{lib_ext}"; - my $is_developer = (-d ".svn" || -d ".git"); - -@@ -54,7 +54,7 @@ if (my $gccversion = $Config{gccversion} - $opts{DEFINE} .= ' -Wmissing-prototypes'; - } - } --$opts{LIBS} = ["-lstdc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 -+$opts{LIBS} = ["-lc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 - $opts{OPTIMIZE} = "-g" if $opt_g; - $opts{CCFLAGS} = "-pg" if $opt_pg; - my $coverage_flags = ""; -@@ -76,7 +76,7 @@ WriteMakefile( - AUTHOR => 'Tim Bunce ', - VERSION_FROM => 'libmemcached.pm', - ABSTRACT_FROM => 'libmemcached.pm', -- INC => "-I$lmcd_inst/include", -+ INC => "-I$lmcd_inst/include/", - # We want to link to *our* private libmemcached and not one that - # might already be installed on the system. The LIBS config gets - # appended to the link command line, so if we used "-L$dir -lmemcached" Property changes on: head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-10 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-9 =================================================================== --- head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-9 (revision 391018) +++ head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-9 (nonexistent) @@ -1,20 +0,0 @@ ---- Makefile.PL.orig 2015-05-07 17:56:22 UTC -+++ Makefile.PL -@@ -30,7 +30,7 @@ $Data::Dumper::Indent = 1; - $Data::Dumper::Sortkeys = 1; - - my $lmcd_api_ver = "1.0"; # eg $lmcd_src/libmemcached-$lmcd_api_ver/ --my $lmcd_inst = getcwd()."/src_inst"; -+my $lmcd_inst = "/usr/local"; - my $lmcd_built_lib = "$lmcd_inst/lib/libmemcached$Config{lib_ext}"; - my $is_developer = (-d ".svn" || -d ".git"); - -@@ -76,7 +76,7 @@ WriteMakefile( - AUTHOR => 'Tim Bunce ', - VERSION_FROM => 'libmemcached.pm', - ABSTRACT_FROM => 'libmemcached.pm', -- INC => "-I$lmcd_inst/include", -+ INC => "-I$lmcd_inst/include/", - # We want to link to *our* private libmemcached and not one that - # might already be installed on the system. The LIBS config gets - # appended to the link command line, so if we used "-L$dir -lmemcached" Property changes on: head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-9 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL =================================================================== --- head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL (nonexistent) +++ head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL (revision 391019) @@ -0,0 +1,11 @@ +--- Makefile.PL.orig 2015-05-07 17:56:22 UTC ++++ Makefile.PL +@@ -54,7 +54,7 @@ if (my $gccversion = $Config{gccversion} + $opts{DEFINE} .= ' -Wmissing-prototypes'; + } + } +-$opts{LIBS} = ["-lstdc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 ++$opts{LIBS} = ["-lc++"]; # else error: libmemcached.so: undefined symbol: __gxx_personality_v0 + $opts{OPTIMIZE} = "-g" if $opt_g; + $opts{CCFLAGS} = "-pg" if $opt_pg; + my $coverage_flags = ""; Property changes on: head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL =================================================================== --- head/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL (nonexistent) +++ head/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL (revision 391019) @@ -0,0 +1,22 @@ +--- Makefile.PL.orig 2015-05-07 17:56:22 UTC ++++ Makefile.PL +@@ -30,8 +30,8 @@ $Data::Dumper::Indent = 1; + $Data::Dumper::Sortkeys = 1; + + my $lmcd_api_ver = "1.0"; # eg $lmcd_src/libmemcached-$lmcd_api_ver/ +-my $lmcd_inst = getcwd()."/src_inst"; +-my $lmcd_built_lib = "$lmcd_inst/lib/libmemcached$Config{lib_ext}"; ++my $lmcd_inst = "%%PREFIX%%"; ++my $lmcd_built_lib = "$lmcd_inst/lib/libmemcached.so"; + my $is_developer = (-d ".svn" || -d ".git"); + + my ($lmcd_h) = eval { build_libmemcached() }; +@@ -76,7 +76,7 @@ WriteMakefile( + AUTHOR => 'Tim Bunce ', + VERSION_FROM => 'libmemcached.pm', + ABSTRACT_FROM => 'libmemcached.pm', +- INC => "-I$lmcd_inst/include", ++ INC => "-I$lmcd_inst/include/", + # We want to link to *our* private libmemcached and not one that + # might already be installed on the system. The LIBS config gets + # appended to the link command line, so if we used "-L$dir -lmemcached" Property changes on: head/databases/p5-Memcached-libmemcached/files/patch-Makefile.PL ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property