On Thursday, December 22, 2011 19:43 CET, Piotr Sikora
<piotr.sik...@frickle.com> wrote:
> Hi,
>
> > -SHARED_LIBS += memcached 0.0 # 0.0
> > -SHARED_LIBS += hashkit 0.0 # 0.0
> > +SHARED_LIBS += memcached 1.0 # 0.0
> > +SHARED_LIBS += hashkit 1.0 # 0.0
> > SHARED_LIBS += memcachedprotocol 0.0 # 0.0
> > SHARED_LIBS += memcachedutil 0.0 # 1.0
>
> memcachedutil should be also bumped (upstream bumped 1.0 to 2.0).
>
> I would also prefer to keep upstream versions in the comments, to easy spot
> such mistakes in the future.
I thought I checked, and was sure, its not needed to bump, but I rechecked
again. one of the memcachedutil header files includes memcached.h, so the bump
is right. I also updated the comments.
So how about this now?
cheers,
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libmemcached/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 11 Jul 2011 14:04:42 -0000 1.10
+++ Makefile 24 Dec 2011 09:37:33 -0000
@@ -2,9 +2,8 @@
COMMENT= C C++ API for memcached
-VERSION= 0.48
+VERSION = 1.0.2
DISTNAME= libmemcached-${VERSION}
-REVISION= 0
CATEGORIES= devel misc
HOMEPAGE= http://libmemcached.org/
@@ -13,10 +12,10 @@
MAINTAINER= Sebastian Reitenbach <sebas...@openbsd.org>
USE_LIBTOOL= Yes
-SHARED_LIBS += memcached 0.0 # 0.0
-SHARED_LIBS += hashkit 0.0 # 0.0
+SHARED_LIBS += memcached 1.0 # 8.0
+SHARED_LIBS += hashkit 1.0 # 1.0
SHARED_LIBS += memcachedprotocol 0.0 # 0.0
-SHARED_LIBS += memcachedutil 0.0 # 1.0
+SHARED_LIBS += memcachedutil 1.0 # 2.0
# BSD
PERMIT_PACKAGE_CDROM= Yes
@@ -25,7 +24,8 @@
PERMIT_DISTFILES_FTP= Yes
USE_GROFF = Yes
-WANTLIB += c event m pthread sasl2
+USE_GMAKE = Yes
+WANTLIB += c m pthread sasl2 stdc++
LIB_DEPENDS= security/cyrus-sasl2
REGRESS_DEPENDS= misc/memcached
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libmemcached/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 14 Apr 2011 11:17:49 -0000 1.3
+++ distinfo 24 Dec 2011 09:37:33 -0000
@@ -1,5 +1,5 @@
-MD5 (libmemcached-0.48.tar.gz) = 4ArlFJKh+dy7bPulDcVHWA==
-RMD160 (libmemcached-0.48.tar.gz) = h7L+IkDHDPZuPWWI8ZyfEt+qhAE=
-SHA1 (libmemcached-0.48.tar.gz) = 9z0K1Va+QQl95rQmhyhBLxfaNUI=
-SHA256 (libmemcached-0.48.tar.gz) =
rQDyqGBhy1YfQiCDED+Y1eUAASPDkXfPXhtNv3bwUpY=
-SIZE (libmemcached-0.48.tar.gz) = 763754
+MD5 (libmemcached-1.0.2.tar.gz) = Wh69XeIvbiRHTLn1eUVv1Q==
+RMD160 (libmemcached-1.0.2.tar.gz) = gKGDq2hToMwHy7O811IobBhyIEg=
+SHA1 (libmemcached-1.0.2.tar.gz) = 2ZKEX+cSEOLpMUe6jynfH8oU5xY=
+SHA256 (libmemcached-1.0.2.tar.gz) =
xcoh27hc5KTekeSu1rPR+KRZmYCqYG7wgS7rUrfQF/I=
+SIZE (libmemcached-1.0.2.tar.gz) = 942891
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/libmemcached/patches/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- patches/patch-configure 14 Apr 2011 11:17:49 -0000 1.2
+++ patches/patch-configure 24 Dec 2011 09:37:33 -0000
@@ -1,10 +1,11 @@
$OpenBSD: patch-configure,v 1.2 2011/04/14 11:17:49 sebastia Exp $
get rid of a truckload of warnings when compiling
+allow to detect MSG_NOSIGNAL and friends
---- configure.orig Wed Mar 16 03:40:33 2011
-+++ configure Fri Apr 1 01:47:32 2011
-@@ -17719,7 +17719,7 @@ fi
+--- configure.orig Wed Oct 26 17:48:39 2011
++++ configure Thu Dec 15 11:12:42 2011
+@@ -7820,7 +7820,7 @@ fi
fi
@@ -13,7 +14,7 @@
CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor
-Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to
use -Wmissing-declarations from C++" >&5
-@@ -17868,7 +17868,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAG
+@@ -7969,7 +7969,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAG
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
save_CXXFLAGS="${CXXFLAGS}"
@@ -22,7 +23,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -17901,9 +17901,9 @@ fi
+@@ -8002,9 +8002,9 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_safe_to_use_Wredundant_decls_" >&5
$as_echo "$ac_cv_safe_to_use_Wredundant_decls_" >&6; }
if test "$ac_cv_safe_to_use_Wredundant_decls_" = "yes"; then :
@@ -34,7 +35,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to
use -Wattributes from C++" >&5
-@@ -18013,7 +18013,7 @@ fi
+@@ -8114,7 +8114,7 @@ fi
fi
@@ -43,3 +44,27 @@
PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces
${NO_ATTRIBUTES}"
NO_WERROR="-Wno-error"
PERMISSIVE_WARNINGS="-Wno-error -Wno-unused-function -fpermissive"
+@@ -25737,6 +25737,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
++#include <sys/types.h>
+ #include <sys/socket.h>
+
+ int
+@@ -25785,6 +25786,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
++#include <sys/types.h>
+ #include <sys/socket.h>
+
+ int
+@@ -25833,6 +25835,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
++#include <sys/types.h>
+ #include <sys/socket.h>
+
+ int
