On Sat, 09 Jul 2011, Piotr Sikora wrote: > Hi, > as promised, attached update to protobuf-2.4.1. > > Test suite passes on amd64, protobuf-c doesn't complain about it either.
Hi Piotr, Thanks a lot. Your diff is good, I've fixed just a pair of nits: USE_GMAKE is not needed and you missed some bits to have a working regress target... Below is the diff I intend to commit, test suite passes on sparc64 too. Cheers! David Index: Makefile =================================================================== RCS file: /cvs/ports/devel/protobuf/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile 8 Jul 2011 07:22:32 -0000 1.3 +++ Makefile 9 Jul 2011 18:00:43 -0000 @@ -2,12 +2,11 @@ COMMENT = c++ protocol buffers -DISTNAME = protobuf-2.3.0 -REVISION = 0 +DISTNAME = protobuf-2.4.1 -SHARED_LIBS += protobuf 0.0 # .4.0 -SHARED_LIBS += protoc 0.0 # .4.0 -SHARED_LIBS += protobuf-lite 0.0 # .4.0 +SHARED_LIBS += protobuf 1.0 # 7.0 +SHARED_LIBS += protoc 1.0 # 7.0 +SHARED_LIBS += protobuf-lite 1.0 # 7.0 CATEGORIES = devel @@ -28,9 +27,15 @@ MASTER_SITES = http://protobuf.googleco REGRESS_DEPENDS = devel/gtest SEPARATE_BUILD = concurrent -USE_GMAKE = Yes USE_LIBTOOL = Yes CONFIGURE_STYLE = gnu CONFIGURE_ARGS += ${CONFIGURE_SHARED} --with-zlib + +pre-configure: + ${SUBST_CMD} ${WRKSRC}/src/Makefile.in + +do-regress: + @cd ${WRKBUILD}/src && exec ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} ${ALL_REGRESS_FLAGS} ${REGRESS_TARGET} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/protobuf/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 24 Mar 2010 19:03:37 -0000 1.1.1.1 +++ distinfo 9 Jul 2011 18:00:43 -0000 @@ -1,5 +1,5 @@ -MD5 (protobuf-2.3.0.tar.gz) = ZduiwEkjWVtvCmpE2BBvCg== -RMD160 (protobuf-2.3.0.tar.gz) = rUtN93iTMWJNtmNajzrh+4fEZUg= -SHA1 (protobuf-2.3.0.tar.gz) = 0OdHJVLlw1LtCvuwezDcs0PJaq8= -SHA256 (protobuf-2.3.0.tar.gz) = ehbPDek5VkfZNvU2IEtAQWQ6oBMXSVCbm5v5el5H5cU= -SIZE (protobuf-2.3.0.tar.gz) = 1849149 +MD5 (protobuf-2.4.1.tar.gz) = 3ITpkS6naLqhl2y3u86ntQ== +RMD160 (protobuf-2.4.1.tar.gz) = WHafhze2rDvWIlAjCFL++53H2LI= +SHA1 (protobuf-2.4.1.tar.gz) = 78hCSVJQB7HjEFCE6ifjJz98v7A= +SHA256 (protobuf-2.4.1.tar.gz) = 6saWm2F/OXJH6AUmfaKw2z/55akWOxI1A6GS+7V3ZWc= +SIZE (protobuf-2.4.1.tar.gz) = 1935301 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/devel/protobuf/patches/patch-Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Makefile_in --- patches/patch-Makefile_in 24 Mar 2010 19:03:37 -0000 1.1.1.1 +++ patches/patch-Makefile_in 9 Jul 2011 18:00:43 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/03/24 19:03:37 landry Exp $ ---- Makefile.in.orig Tue Jan 12 11:10:43 2010 -+++ Makefile.in Tue Jan 12 11:11:34 2010 -@@ -827,26 +827,6 @@ uninstall-am: uninstall-pkgconfigDATA - uninstall uninstall-am uninstall-pkgconfigDATA +--- Makefile.in.orig Sat Apr 30 19:25:00 2011 ++++ Makefile.in Sat Jul 9 02:40:51 2011 +@@ -957,27 +957,6 @@ uninstall-am: uninstall-pkgconfigDATA + uninstall-pkgconfigDATA -# Build gtest before we build protobuf tests. We don't add gtest to SUBDIRS @@ -25,6 +25,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20 - echo "Making clean in gtest"; \ - cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \ - fi +- # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/devel/protobuf/patches/patch-configure,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure --- patches/patch-configure 8 Jul 2011 07:22:32 -0000 1.2 +++ patches/patch-configure 9 Jul 2011 18:00:43 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.2 2011/07/08 07:22:32 dcoppa Exp $ ---- configure.orig Fri Jan 8 20:26:18 2010 -+++ configure Thu Jul 7 15:44:35 2011 -@@ -906,7 +906,6 @@ CXX +--- configure.orig Sat Apr 30 19:24:59 2011 ++++ configure Sat Jul 9 02:36:18 2011 +@@ -904,7 +904,6 @@ CXX CXXFLAGS CCC CXXCPP' @@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.2 2011/07/ # Initialize some variables set by options. ac_init_help= -@@ -16887,7 +16886,7 @@ test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" +@@ -15569,7 +15568,7 @@ test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" # FIXME: -fPIC is required for -shared on many architectures, # so we specify it here, but the right way would probably be to # properly detect whether it is actually required. @@ -18,25 +18,25 @@ $OpenBSD: patch-configure,v 1.2 2011/07/ LIBS="$PTHREAD_LIBS $LIBS" CC="$PTHREAD_CC" -@@ -17019,7 +17018,7 @@ echo "${ECHO_T}no" >&6; } +@@ -15649,7 +15648,7 @@ $as_echo "no" >&6; } if test x"$done" = xno; then - { echo "$as_me:$LINENO: checking whether -lpthread fixes that" >&5 - echo $ECHO_N "checking whether -lpthread fixes that... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lpthread fixes that" >&5 + $as_echo_n "checking whether -lpthread fixes that... " >&6; } - LIBS="-lpthread $PTHREAD_LIBS $save_LIBS" + LIBS="-pthread $PTHREAD_LIBS $save_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -17069,7 +17068,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <pthread.h> +@@ -15672,7 +15671,7 @@ rm -f core conftest.err conftest.$ac_objext \ if test "x$done" = xyes; then - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } - PTHREAD_LIBS="-lpthread $PTHREAD_LIBS" + PTHREAD_LIBS="-pthread $PTHREAD_LIBS" else - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } -@@ -17294,12 +17293,6 @@ echo "$as_me: WARNING: could not find an STL hash_map" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -15947,14 +15946,6 @@ $as_echo "$as_me: WARNING: could not find an STL hash_ fi @@ -45,6 +45,8 @@ $OpenBSD: patch-configure,v 1.2 2011/07/ -# too. -export CFLAGS -export CXXFLAGS +- +- -subdirs="$subdirs gtest" Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/devel/protobuf/patches/patch-src_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_Makefile_in --- patches/patch-src_Makefile_in 24 Mar 2010 19:03:37 -0000 1.1.1.1 +++ patches/patch-src_Makefile_in 9 Jul 2011 18:00:43 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2010/03/24 19:03:37 landry Exp $ ---- src/Makefile.in.orig Tue Jan 12 11:12:09 2010 -+++ src/Makefile.in Tue Jan 12 11:19:21 2010 -@@ -139,8 +139,8 @@ protobuf_lazy_descriptor_test_OBJECTS = \ +--- src/Makefile.in.orig Sat Apr 30 19:25:00 2011 ++++ src/Makefile.in Sat Jul 9 02:32:35 2011 +@@ -156,8 +156,8 @@ protobuf_lazy_descriptor_test_OBJECTS = \ $(am_protobuf_lazy_descriptor_test_OBJECTS) \ $(nodist_protobuf_lazy_descriptor_test_OBJECTS) protobuf_lazy_descriptor_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @@ -12,7 +12,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.1.1. protobuf_lazy_descriptor_test_LINK = $(LIBTOOL) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) \ -@@ -207,8 +207,8 @@ nodist_protobuf_test_OBJECTS = $(am__objects_8) +@@ -224,8 +224,8 @@ nodist_protobuf_test_OBJECTS = $(am__objects_8) protobuf_test_OBJECTS = $(am_protobuf_test_OBJECTS) \ $(nodist_protobuf_test_OBJECTS) protobuf_test_DEPENDENCIES = $(am__DEPENDENCIES_1) libprotobuf.la \ @@ -23,7 +23,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.1.1. protobuf_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(protobuf_test_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -220,7 +220,7 @@ am_test_plugin_OBJECTS = test_plugin-mock_code_generat +@@ -237,7 +237,7 @@ am_test_plugin_OBJECTS = test_plugin-mock_code_generat test_plugin-file.$(OBJEXT) test_plugin-test_plugin.$(OBJEXT) test_plugin_OBJECTS = $(am_test_plugin_OBJECTS) test_plugin_DEPENDENCIES = $(am__DEPENDENCIES_1) libprotobuf.la \ @@ -32,7 +32,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.1.1. am__zcgunzip_SOURCES_DIST = google/protobuf/testing/zcgunzip.cc @HAVE_ZLIB_TRUE@am_zcgunzip_OBJECTS = zcgunzip.$(OBJEXT) zcgunzip_OBJECTS = $(am_zcgunzip_OBJECTS) -@@ -670,11 +670,10 @@ COMMON_TEST_SOURCES = \ +@@ -692,11 +692,10 @@ COMMON_TEST_SOURCES = \ google/protobuf/testing/file.h protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ @@ -47,7 +47,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.1.1. # Disable optimization for tests unless the user explicitly asked for it, # since test_util.cc takes forever to compile with optimization (with GCC). -@@ -716,11 +715,10 @@ nodist_protobuf_test_SOURCES = $(protoc_outputs) +@@ -738,11 +737,10 @@ nodist_protobuf_test_SOURCES = $(protoc_outputs) # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ @@ -62,7 +62,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.1.1. -DPROTOBUF_TEST_NO_DESCRIPTORS protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) -@@ -742,10 +740,9 @@ nodist_protobuf_lite_test_SOURCES = $(protoc_lite_outp +@@ -764,10 +762,9 @@ nodist_protobuf_lite_test_SOURCES = $(protoc_lite_outp # Test plugin binary. test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
