Date: Thu, 5 Nov 2009 15:03:55 +0100 (CET) From: Florian Smeets <flo@kasimir.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/140314: [PATCH] devel/libs11n: update to 1.3.0 Message-ID: <20091105140355.C0FAA3F4E1@mail.solomo.de> Resent-Message-ID: <200911051410.nA5EA1k4043340@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140314
>Category: ports
>Synopsis: [PATCH] devel/libs11n: update to 1.3.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 05 14:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Florian Smeets
>Release: FreeBSD 7.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD mail.solomo.de 7.2-STABLE FreeBSD 7.2-STABLE #10: Fri Oct 16 15:21:55 CEST 2009
>Description:
- Update to 1.3.0
Added file(s):
- files/patch-shake-n-make.make
Removed file(s):
- files/Makefile.bsd
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- libs11n-1.3.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/libs11n.orig/Makefile /usr/ports/devel/libs11n/Makefile
--- /usr/ports/devel/libs11n.orig/Makefile 2009-11-05 15:00:42.000000000 +0100
+++ /usr/ports/devel/libs11n/Makefile 2009-11-05 15:01:24.000000000 +0100
@@ -6,7 +6,7 @@
#
PORTNAME= libs11n
-PORTVERSION= 1.2.8
+PORTVERSION= 1.3.0
CATEGORIES= devel
MASTER_SITES= SF/s11n/s11n/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-nobuildfiles
@@ -14,13 +14,12 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= A C++ library for easily serializing a wide variety of objects
+MAKEFILE= GNUmakefile
WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_ZIP= yes
+USE_GMAKE= yes
USE_LDCONFIG= yes
-post-extract:
- @${CP} ${PATCHDIR}/Makefile.bsd ${WRKSRC}/Makefile
-
pre-install:
${MKDIR} ${PREFIX}/include/s11n.net
${MKDIR} ${PREFIX}/include/s11n.net/s11n
diff -ruN --exclude=CVS /usr/ports/devel/libs11n.orig/distinfo /usr/ports/devel/libs11n/distinfo
--- /usr/ports/devel/libs11n.orig/distinfo 2009-11-05 15:00:42.000000000 +0100
+++ /usr/ports/devel/libs11n/distinfo 2009-11-05 15:01:25.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (libs11n-1.2.8-nobuildfiles.zip) = 85f966702a62c52c803ffbb3b3d778ba
-SHA256 (libs11n-1.2.8-nobuildfiles.zip) = 04b369018df330b2f561b6da6d780ad4acbee049f5dfaa982839f3ec99c9f449
-SIZE (libs11n-1.2.8-nobuildfiles.zip) = 291367
+MD5 (libs11n-1.3.0-nobuildfiles.zip) = 912bd53df61755b9eacc9539d208f0e9
+SHA256 (libs11n-1.3.0-nobuildfiles.zip) = e9676add7bc49e2329f6ad6a078a0a90dd3b662c7da255d8e3f4529bab4de22f
+SIZE (libs11n-1.3.0-nobuildfiles.zip) = 329059
diff -ruN --exclude=CVS /usr/ports/devel/libs11n.orig/files/Makefile.bsd /usr/ports/devel/libs11n/files/Makefile.bsd
--- /usr/ports/devel/libs11n.orig/files/Makefile.bsd 2009-11-05 15:00:42.000000000 +0100
+++ /usr/ports/devel/libs11n/files/Makefile.bsd 1970-01-01 01:00:00.000000000 +0100
@@ -1,126 +0,0 @@
-LIB= s11n
-CXXFLAGS+= -Wall -O2 -fPIC -I../include
-SHLIB_MAJOR= 1
-SHLIB_MINOR= 2
-SRCS= exception.cpp \
- s11n.cpp \
- s11n_node.cpp \
- path_finder.cpp \
- plugin.cpp \
- compact.flex.cpp \
- compact_serializer.cpp \
- data_node_io.cpp \
- funtxt.flex.cpp \
- funtxt_serializer.cpp \
- funxml.flex.cpp \
- funxml_serializer.cpp \
- parens.flex.cpp \
- parens_serializer.cpp \
- simplexml.flex.cpp \
- simplexml_serializer.cpp \
- strtool.cpp \
- wesnoth.flex.cpp \
- wesnoth_serializer.cpp \
- s11nlite.cpp
-
-INCSGROUPS= ROOTINC IOINC NODEINC PLUGINC \
- PROXYINC PODINC STDINC
-INCLUDEBASE= ${PREFIX}/include/s11n.net/s11n
-
-ROOTINCDIR= ${INCLUDEBASE}
-ROOTINC= ../include/s11n.net/s11n/abstract_creator.hpp \
-../include/s11n.net/s11n/algo.hpp \
-../include/s11n.net/s11n/algo.tpp \
-../include/s11n.net/s11n/classload.hpp \
-../include/s11n.net/s11n/classload.tpp \
-../include/s11n.net/s11n/client_api.hpp \
-../include/s11n.net/s11n/exception.hpp \
-../include/s11n.net/s11n/export.hpp \
-../include/s11n.net/s11n/factory.hpp \
-../include/s11n.net/s11n/factory_reg.hpp \
-../include/s11n.net/s11n/functional.hpp \
-../include/s11n.net/s11n/micro_api.hpp \
-../include/s11n.net/s11n/phoenix.hpp \
-../include/s11n.net/s11n/reg_s11n_traits.hpp \
-../include/s11n.net/s11n/s11n.hpp \
-../include/s11n.net/s11n/s11n_config.hpp \
-../include/s11n.net/s11n/s11n_debuggering_macros.hpp \
-../include/s11n.net/s11n/s11n_node.hpp \
-../include/s11n.net/s11n/s11nlite.hpp \
-../include/s11n.net/s11n/serialize.hpp \
-../include/s11n.net/s11n/serialize.tpp \
-../include/s11n.net/s11n/simple_config.hpp \
-../include/s11n.net/s11n/tags.hpp \
-../include/s11n.net/s11n/traits.hpp \
-../include/s11n.net/s11n/type_traits.hpp \
-../include/s11n.net/s11n/variant.hpp
-
-IOINCDIR= ${INCLUDEBASE}/io
-IOINC= ../include/s11n.net/s11n/io/FlexLexer.hpp \
-../include/s11n.net/s11n/io/compact_data_nodeFlexLexer.hpp \
-../include/s11n.net/s11n/io/compact_serializer.hpp \
-../include/s11n.net/s11n/io/data_node_format.hpp \
-../include/s11n.net/s11n/io/data_node_io.hpp \
-../include/s11n.net/s11n/io/expat_serializer.hpp \
-../include/s11n.net/s11n/io/funtxt_data_nodeFlexLexer.hpp \
-../include/s11n.net/s11n/io/funtxt_serializer.hpp \
-../include/s11n.net/s11n/io/funxml_data_nodeFlexLexer.hpp \
-../include/s11n.net/s11n/io/funxml_serializer.hpp \
-../include/s11n.net/s11n/io/parens_data_nodeFlexLexer.hpp \
-../include/s11n.net/s11n/io/parens_serializer.hpp \
-../include/s11n.net/s11n/io/reg_serializer.hpp \
-../include/s11n.net/s11n/io/serializers.hpp \
-../include/s11n.net/s11n/io/simplexml_data_nodeFlexLexer.hpp \
-../include/s11n.net/s11n/io/simplexml_serializer.hpp \
-../include/s11n.net/s11n/io/strtool.hpp \
-../include/s11n.net/s11n/io/wesnoth_data_nodeFlexLexer.hpp \
-../include/s11n.net/s11n/io/wesnoth_serializer.hpp
-
-NODEINCDIR= ${INCLUDEBASE}/nodeutil
-NODEINC= ../include/s11n.net/s11n/nodeutil/node_tree.hpp
-
-PLUGINCDIR= ${INCLUDEBASE}/plugin
-PLUGINC= ../include/s11n.net/s11n/plugin/path_finder.hpp \
-../include/s11n.net/s11n/plugin/plugin.hpp \
-../include/s11n.net/s11n/plugin/plugin_config.hpp
-
-PROXYINCDIR= ${INCLUDEBASE}/proxy
-PROXYINC= ../include/s11n.net/s11n/proxy/listish.hpp \
-../include/s11n.net/s11n/proxy/listish.tpp \
-../include/s11n.net/s11n/proxy/mapish.hpp \
-../include/s11n.net/s11n/proxy/mapish.tpp \
-../include/s11n.net/s11n/proxy/path_finder_s11n.hpp \
-../include/s11n.net/s11n/proxy/reg_list_specializations.hpp \
-../include/s11n.net/s11n/proxy/reg_map_specializations.hpp \
-../include/s11n.net/s11n/proxy/reg_node_type.hpp \
-../include/s11n.net/s11n/proxy/reg_s11n_traits_template1.hpp \
-../include/s11n.net/s11n/proxy/reg_s11n_traits_template2.hpp
-
-PODINCDIR= ${PROXYINCDIR}/pod
-PODINC= ../include/s11n.net/s11n/proxy/pod/bool.hpp \
-../include/s11n.net/s11n/proxy/pod/char.hpp \
-../include/s11n.net/s11n/proxy/pod/double.hpp \
-../include/s11n.net/s11n/proxy/pod/float.hpp \
-../include/s11n.net/s11n/proxy/pod/int.hpp \
-../include/s11n.net/s11n/proxy/pod/long.hpp \
-../include/s11n.net/s11n/proxy/pod/long_double.hpp \
-../include/s11n.net/s11n/proxy/pod/size_t.hpp \
-../include/s11n.net/s11n/proxy/pod/string.hpp \
-../include/s11n.net/s11n/proxy/pod/uint.hpp \
-../include/s11n.net/s11n/proxy/pod/ulong.hpp
-
-STDINCDIR= ${PROXYINCDIR}/std
-STDINC= ../include/s11n.net/s11n/proxy/std/deque.hpp \
-../include/s11n.net/s11n/proxy/std/list.hpp \
-../include/s11n.net/s11n/proxy/std/map.hpp \
-../include/s11n.net/s11n/proxy/std/multimap.hpp \
-../include/s11n.net/s11n/proxy/std/multiset.hpp \
-../include/s11n.net/s11n/proxy/std/pair.hpp \
-../include/s11n.net/s11n/proxy/std/set.hpp \
-../include/s11n.net/s11n/proxy/std/valarray.hpp \
-../include/s11n.net/s11n/proxy/std/vector.hpp
-
-LIBDIR= ${PREFIX}/lib
-
-.include <bsd.lib.mk>
-
diff -ruN --exclude=CVS /usr/ports/devel/libs11n.orig/files/patch-shake-n-make.make /usr/ports/devel/libs11n/files/patch-shake-n-make.make
--- /usr/ports/devel/libs11n.orig/files/patch-shake-n-make.make 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/devel/libs11n/files/patch-shake-n-make.make 2009-11-05 15:01:25.000000000 +0100
@@ -0,0 +1,11 @@
+--- ./shake-n-make.make.orig 2009-11-05 13:57:57.000000000 +0000
++++ ./shake-n-make.make 2009-11-05 13:58:16.000000000 +0000
+@@ -232,7 +232,7 @@
+ ########################################################################
+ # DESTDIR is for GNU Autotools compatibility...
+ DESTDIR ?=
+-prefix ?= /usr/local
++prefix ?= ${PREFIX}
+ ShakeNMake.INSTALL.DESTDIR = $(DESTDIR)
+ ShakeNMake.INSTALL.PREFIX = $(prefix)
+ ShakeNMake.INSTALL_ROOT=$(DESTDIR)$(prefix)/
diff -ruN --exclude=CVS /usr/ports/devel/libs11n.orig/pkg-descr /usr/ports/devel/libs11n/pkg-descr
--- /usr/ports/devel/libs11n.orig/pkg-descr 2009-11-05 15:00:42.000000000 +0100
+++ /usr/ports/devel/libs11n/pkg-descr 2009-11-05 15:01:25.000000000 +0100
@@ -14,4 +14,3 @@
WWW: http://s11n.net
Author: Stephan Beal <stephan@s11n.net>
-
diff -ruN --exclude=CVS /usr/ports/devel/libs11n.orig/pkg-plist /usr/ports/devel/libs11n/pkg-plist
--- /usr/ports/devel/libs11n.orig/pkg-plist 2009-11-05 15:00:42.000000000 +0100
+++ /usr/ports/devel/libs11n/pkg-plist 2009-11-05 15:01:25.000000000 +0100
@@ -1,61 +1,36 @@
-include/s11n.net/s11n/abstract_creator.hpp
-include/s11n.net/s11n/algo.hpp
-include/s11n.net/s11n/algo.tpp
-include/s11n.net/s11n/classload.hpp
-include/s11n.net/s11n/classload.tpp
-include/s11n.net/s11n/client_api.hpp
-include/s11n.net/s11n/exception.hpp
-include/s11n.net/s11n/export.hpp
-include/s11n.net/s11n/factory.hpp
-include/s11n.net/s11n/factory_reg.hpp
-include/s11n.net/s11n/functional.hpp
+include/s11n.net/s11n/io/expat_serializer.hpp
+include/s11n.net/s11n/io/data_node_io.hpp
include/s11n.net/s11n/io/FlexLexer.hpp
-include/s11n.net/s11n/io/compact_data_nodeFlexLexer.hpp
+include/s11n.net/s11n/io/reg_serializer.hpp
+include/s11n.net/s11n/io/serializers.hpp
+include/s11n.net/s11n/io/strtool.hpp
+include/s11n.net/s11n/io/url.hpp
include/s11n.net/s11n/io/compact_serializer.hpp
-include/s11n.net/s11n/io/data_node_format.hpp
-include/s11n.net/s11n/io/data_node_io.hpp
-include/s11n.net/s11n/io/expat_serializer.hpp
-include/s11n.net/s11n/io/funtxt_data_nodeFlexLexer.hpp
+include/s11n.net/s11n/io/compact_data_nodeFlexLexer.hpp
include/s11n.net/s11n/io/funtxt_serializer.hpp
-include/s11n.net/s11n/io/funxml_data_nodeFlexLexer.hpp
+include/s11n.net/s11n/io/funtxt_data_nodeFlexLexer.hpp
include/s11n.net/s11n/io/funxml_serializer.hpp
-include/s11n.net/s11n/io/parens_data_nodeFlexLexer.hpp
+include/s11n.net/s11n/io/funxml_data_nodeFlexLexer.hpp
+include/s11n.net/s11n/io/js_serializer.hpp
include/s11n.net/s11n/io/parens_serializer.hpp
-include/s11n.net/s11n/io/reg_serializer.hpp
-include/s11n.net/s11n/io/serializers.hpp
-include/s11n.net/s11n/io/simplexml_data_nodeFlexLexer.hpp
+include/s11n.net/s11n/io/parens_data_nodeFlexLexer.hpp
include/s11n.net/s11n/io/simplexml_serializer.hpp
-include/s11n.net/s11n/io/strtool.hpp
-include/s11n.net/s11n/io/wesnoth_data_nodeFlexLexer.hpp
+include/s11n.net/s11n/io/simplexml_data_nodeFlexLexer.hpp
include/s11n.net/s11n/io/wesnoth_serializer.hpp
-include/s11n.net/s11n/micro_api.hpp
-include/s11n.net/s11n/nodeutil/node_tree.hpp
-include/s11n.net/s11n/phoenix.hpp
-include/s11n.net/s11n/plugin/path_finder.hpp
-include/s11n.net/s11n/plugin/plugin.hpp
-include/s11n.net/s11n/plugin/plugin_config.hpp
-include/s11n.net/s11n/proxy/listish.hpp
-include/s11n.net/s11n/proxy/listish.tpp
-include/s11n.net/s11n/proxy/mapish.hpp
-include/s11n.net/s11n/proxy/mapish.tpp
-include/s11n.net/s11n/proxy/path_finder_s11n.hpp
-include/s11n.net/s11n/proxy/pod/bool.hpp
+include/s11n.net/s11n/io/wesnoth_data_nodeFlexLexer.hpp
+include/s11n.net/s11n/io/data_node_format.hpp
+include/s11n.net/s11n/proxy/pod/ulong.hpp
include/s11n.net/s11n/proxy/pod/char.hpp
include/s11n.net/s11n/proxy/pod/double.hpp
include/s11n.net/s11n/proxy/pod/float.hpp
include/s11n.net/s11n/proxy/pod/int.hpp
-include/s11n.net/s11n/proxy/pod/long.hpp
include/s11n.net/s11n/proxy/pod/long_double.hpp
+include/s11n.net/s11n/proxy/pod/long.hpp
include/s11n.net/s11n/proxy/pod/size_t.hpp
include/s11n.net/s11n/proxy/pod/string.hpp
include/s11n.net/s11n/proxy/pod/uint.hpp
-include/s11n.net/s11n/proxy/pod/ulong.hpp
-include/s11n.net/s11n/proxy/reg_list_specializations.hpp
-include/s11n.net/s11n/proxy/reg_map_specializations.hpp
-include/s11n.net/s11n/proxy/reg_node_type.hpp
-include/s11n.net/s11n/proxy/reg_s11n_traits_template1.hpp
-include/s11n.net/s11n/proxy/reg_s11n_traits_template2.hpp
-include/s11n.net/s11n/proxy/std/deque.hpp
+include/s11n.net/s11n/proxy/pod/bool.hpp
+include/s11n.net/s11n/proxy/std/vector.hpp
include/s11n.net/s11n/proxy/std/list.hpp
include/s11n.net/s11n/proxy/std/map.hpp
include/s11n.net/s11n/proxy/std/multimap.hpp
@@ -63,24 +38,53 @@
include/s11n.net/s11n/proxy/std/pair.hpp
include/s11n.net/s11n/proxy/std/set.hpp
include/s11n.net/s11n/proxy/std/valarray.hpp
-include/s11n.net/s11n/proxy/std/vector.hpp
+include/s11n.net/s11n/proxy/std/deque.hpp
+include/s11n.net/s11n/proxy/path_finder_s11n.hpp
+include/s11n.net/s11n/proxy/reg_list_specializations.hpp
+include/s11n.net/s11n/proxy/reg_map_specializations.hpp
+include/s11n.net/s11n/proxy/reg_node_type.hpp
+include/s11n.net/s11n/proxy/reg_s11n_traits_template1.hpp
+include/s11n.net/s11n/proxy/listish.hpp
+include/s11n.net/s11n/proxy/reg_s11n_traits_template3.hpp
+include/s11n.net/s11n/proxy/reg_s11n_traits_template4.hpp
+include/s11n.net/s11n/proxy/listish.tpp
+include/s11n.net/s11n/proxy/mapish.tpp
+include/s11n.net/s11n/proxy/reg_s11n_traits_template2.hpp
+include/s11n.net/s11n/proxy/mapish.hpp
+include/s11n.net/s11n/nodeutil/node_tree.hpp
+include/s11n.net/s11n/plugin/path_finder.hpp
+include/s11n.net/s11n/plugin/plugin.hpp
+include/s11n.net/s11n/plugin/plugin_config.hpp
+include/s11n.net/s11n/classload.hpp
+include/s11n.net/s11n/classload.tpp
+include/s11n.net/s11n/exception.hpp
+include/s11n.net/s11n/export.hpp
+include/s11n.net/s11n/factory.hpp
+include/s11n.net/s11n/factory_reg.hpp
+include/s11n.net/s11n/functional.hpp
+include/s11n.net/s11n/phoenix.hpp
+include/s11n.net/s11n/refcount.hpp
include/s11n.net/s11n/reg_s11n_traits.hpp
-include/s11n.net/s11n/s11n.hpp
-include/s11n.net/s11n/s11n_config.hpp
include/s11n.net/s11n/s11n_debuggering_macros.hpp
+include/s11n.net/s11n/s11n.hpp
include/s11n.net/s11n/s11n_node.hpp
-include/s11n.net/s11n/s11nlite.hpp
include/s11n.net/s11n/serialize.hpp
include/s11n.net/s11n/serialize.tpp
-include/s11n.net/s11n/simple_config.hpp
include/s11n.net/s11n/tags.hpp
+include/s11n.net/s11n/mutex.hpp
include/s11n.net/s11n/traits.hpp
include/s11n.net/s11n/type_traits.hpp
include/s11n.net/s11n/variant.hpp
-lib/libs11n.a
+include/s11n.net/s11n/client_api.hpp
+include/s11n.net/s11n/micro_api.hpp
+include/s11n.net/s11n/s11nlite.hpp
+include/s11n.net/s11n/simple_config.hpp
+include/s11n.net/s11n/s11n_config.hpp
+include/s11n.net/s11n/abstract_creator.hpp
+include/s11n.net/s11n/algo.hpp
+include/s11n.net/s11n/algo.tpp
+bin/s11nconvert
lib/libs11n.so
-lib/libs11n.so.1
-lib/libs11n_p.a
@dirrm include/s11n.net/s11n/proxy/std
@dirrm include/s11n.net/s11n/proxy/pod
@dirrm include/s11n.net/s11n/proxy
--- libs11n-1.3.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091105140355.C0FAA3F4E1>