Date: Tue, 30 Jun 2015 19:28:32 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390986 - in head/databases/p5-Memcached-libmemcached: . files Message-ID: <201506301928.t5UJSWFa076976@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Jun 30 19:28:32 2015 New Revision: 390986 URL: https://svnweb.freebsd.org/changeset/ports/390986 Log: databases/p5-Memcached-libmemcached: update to 1.001801 While here, patch out the bundled libmemcached and use the one from ports Added: head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-10 (contents, props changed) head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-9 (contents, props changed) Deleted: head/databases/p5-Memcached-libmemcached/files/patch-src__libmemcached__docs__memslap.pod Modified: head/databases/p5-Memcached-libmemcached/Makefile head/databases/p5-Memcached-libmemcached/distinfo Modified: head/databases/p5-Memcached-libmemcached/Makefile ============================================================================== --- head/databases/p5-Memcached-libmemcached/Makefile Tue Jun 30 19:26:32 2015 (r390985) +++ head/databases/p5-Memcached-libmemcached/Makefile Tue Jun 30 19:28:32 2015 (r390986) @@ -2,22 +2,31 @@ # $FreeBSD$ PORTNAME= Memcached-libmemcached -PORTVERSION= 0.44.06 -PORTREVISION= 1 +PORTVERSION= 1.001801 CATEGORIES= databases devel perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= CPAN:TIMB PKGNAMEPREFIX= p5- -DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E} 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-patch: - @${REINPLACE_CMD} -e '/my $$configure_args/ s|--disable-shared|& --without-memcached --disable-dtrace|' ${WRKSRC}/Makefile.PL +post-extract: + @${RM} -r ${WRKDIR}/src + +.include <bsd.port.pre.mk> + +.if ${OPSYS} == FreeBSD +.if ${OSVERSION} > 1000000 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.PL-10 +.else +EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.PL-9 +.endif +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/databases/p5-Memcached-libmemcached/distinfo ============================================================================== --- head/databases/p5-Memcached-libmemcached/distinfo Tue Jun 30 19:26:32 2015 (r390985) +++ head/databases/p5-Memcached-libmemcached/distinfo Tue Jun 30 19:28:32 2015 (r390986) @@ -1,2 +1,2 @@ -SHA256 (Memcached-libmemcached-0.4406.tar.gz) = def5f5c43ebcf49bd60b7b8cebe67c20ca21e03328fe5854f36d7f539bed21e3 -SIZE (Memcached-libmemcached-0.4406.tar.gz) = 837725 +SHA256 (Memcached-libmemcached-1.001801.tar.gz) = aa07972fdb74cffde6b7fee648a3a58d3129af22e06a073d1388d778f6e8dca5 +SIZE (Memcached-libmemcached-1.001801.tar.gz) = 1162993 Added: head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-10 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-10 Tue Jun 30 19:28:32 2015 (r390986) @@ -0,0 +1,29 @@ +--- 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 <Tim.Bunce@pobox.com>', + 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" Added: head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-9 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/p5-Memcached-libmemcached/files/extra-patch-Makefile.PL-9 Tue Jun 30 19:28:32 2015 (r390986) @@ -0,0 +1,20 @@ +--- 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 <Tim.Bunce@pobox.com>', + 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506301928.t5UJSWFa076976>