Fix: Patch attached with submission follows:
I got plist errors when building the update locally. Can you check those (for example, with porttools)?
On 07/03/13 00:53, Raphael Kubo da Costa wrote: > I got plist errors when building the update locally. Can you check those > (for example, with porttools)? > Sorry for messing it up. Here's a new patch. bye & Thanks av.
Thank you. I've got a few additional comments after looking at the port's Makefile: o Instead of the BUILD_DEPENDS line you added, you can use USE_GNOME=libxml2:build instead. o libxml2 does not seem to be a build-dependency, but rather a generic library dependency (ie. LIB_DEPENDS). The pkg-config files generated by the port depend on it, for example. o There's a section in the Makefile that says #Not needed without execinfo or xml #CFLAGS+= -I${LOCALBASE}/include #LDFLAGS+= -L${LOCALBASE}/lib Now that xml support has been added, do you need to uncomment out those lines?
On 07/04/13 11:47, Raphael Kubo da Costa wrote: > Thank you. I've got a few additional comments after looking at the > port's Makefile: Thanks to you and please forgive my inexperience. > o Instead of the BUILD_DEPENDS line you added, you can use > USE_GNOME=libxml2:build instead. Fine for me; I didn't know about this. Do you want me to send another patch? > o libxml2 does not seem to be a build-dependency, but rather a generic > library dependency (ie. LIB_DEPENDS). The pkg-config files generated > by the port depend on it, for example. Hmm... I checked the port's own Makefile and it does not link against it. Also, I'm developing a project which uses this library and I don't link against libxml2 either. However, feel free to put it as a library dependency if you think it should be like this. Or I can send another patch if you confirm. > o There's a section in the Makefile that says > > #Not needed without execinfo or xml > #CFLAGS+= -I${LOCALBASE}/include > #LDFLAGS+= -L${LOCALBASE}/lib > > Now that xml support has been added, do you need to uncomment out > those lines? I don't think so... this might be remnants of a very old version. libxml2 requires "-I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include", but that is achieved by uncommenting the following line in the port's Makefile: CFLAGS += `xml2-config --cflags` This is done through "patch/files-Makefile". If changing CFLAGS in our Makefile is considered to be more elegant, the above lines must still be altered (patch/files-Makfile won't go away, though). I tested against 8.3 and 9.1 and it compiles fine. Did you find some problem on another platform? bye & Thanks av.
Sorry for disappearing; other things ended up taking most of my time in the past few days. I'll get back to your questions this week.
(Re-adding bug-followup@ to the CC list). Andrea Venturoli <ml@netfence.it> writes: > On 07/04/13 12:21, Andrea Venturoli wrote: > > Today I finally found a case where libxml2 is needed. > > So I think I could put > > USE_GNOME=libxml2 > > in the Makefile. > > Ok? > If so, I'll send another patch. Sorry for taking so long :-( Yes, please send another patch. Also note that if libxml is only needed at build-time, you should use USE_GNOME=libxml2:build. Going back to the three points I mentioned originall, I guess this would solve all of them, right?
On 07/29/13 00:09, Raphael Kubo da Costa wrote: > Yes, please send another patch. Also note that if libxml is only needed > at build-time, you should use USE_GNOME=libxml2:build. > > Going back to the three points I mentioned originall, I guess this would > solve all of them, right? Here's the patch, which, I think, solves all problems arisen so far. Let me know. bye & Thanks av.
On 08/18/13 16:37, Andrea Venturoli wrote: > On 07/29/13 00:09, Raphael Kubo da Costa wrote: > >> Yes, please send another patch. Also note that if libxml is only needed >> at build-time, you should use USE_GNOME=libxml2:build. >> >> Going back to the three points I mentioned originall, I guess this would >> solve all of them, right? > > Here's the patch, which, I think, solves all problems arisen so far. > Let me know. > > bye & Thanks > av. > Sorry, here's the patch!
Thank you. I will commit it with the following changes compared to your latest patch: o The USE_GNOME line has been moved to the block with the other USE_* ones, and I've added a tab character between "=" and "libxml2". o I've removed the chunk in files/patch-Makefile that only removed a tab character from "PREFIX= /usr/local".
Author: rakuco Date: Sun Aug 18 20:35:21 2013 New Revision: 324934 URL: http://svnweb.freebsd.org/changeset/ports/324934 Log: Update to 2.3.9.9. PR: ports/180168 Submitted by: Andrea Venturoli <ml@netfence.it> (maintainer) Modified: head/net/Sockets/Makefile head/net/Sockets/distinfo head/net/Sockets/files/patch-Makefile head/net/Sockets/files/patch-Sockets-config.cpp head/net/Sockets/pkg-plist Modified: head/net/Sockets/Makefile ============================================================================== --- head/net/Sockets/Makefile Sun Aug 18 19:19:11 2013 (r324933) +++ head/net/Sockets/Makefile Sun Aug 18 20:35:21 2013 (r324934) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Sockets -PORTVERSION= 2.3.9.7 +PORTVERSION= 2.3.9.9 CATEGORIES= net MASTER_SITES= http://www.alhem.net/Sockets/ \ http://www.netfence.it/Sockets/ @@ -18,6 +18,7 @@ COMMENT= A C++ wrapper for BSD-style soc #LDFLAGS+= -L${LOCALBASE}/lib USE_GMAKE= yes +USE_GNOME= libxml2 USE_OPENSSL= yes USE_LDCONFIG= yes Modified: head/net/Sockets/distinfo ============================================================================== --- head/net/Sockets/distinfo Sun Aug 18 19:19:11 2013 (r324933) +++ head/net/Sockets/distinfo Sun Aug 18 20:35:21 2013 (r324934) @@ -1,2 +1,2 @@ -SHA256 (Sockets-2.3.9.7.tar.gz) = dc6411eb53933c0aba639b3ace98b34b674a97aad6b8613f02e5e0aa2af92b24 -SIZE (Sockets-2.3.9.7.tar.gz) = 203023 +SHA256 (Sockets-2.3.9.9.tar.gz) = 5b88723fe26836fb42dc9d8c974e801fdb7a404c27511247e560455bef0ebc60 +SIZE (Sockets-2.3.9.9.tar.gz) = 206119 Modified: head/net/Sockets/files/patch-Makefile ============================================================================== --- head/net/Sockets/files/patch-Makefile Sun Aug 18 19:19:11 2013 (r324933) +++ head/net/Sockets/files/patch-Makefile Sun Aug 18 20:35:21 2013 (r324934) @@ -1,6 +1,29 @@ ---- /Makefile.orig 2010-06-29 21:16:10.000000000 +0200 -+++ Makefile 2010-06-29 21:17:45.000000000 +0200 -@@ -90,9 +90,9 @@ +--- Makefile.orig 2013-04-10 19:52:39.000000000 +0200 ++++ Makefile 2013-07-04 08:17:52.000000000 +0200 +@@ -1,11 +1,11 @@ + # platforms: +-# linux-x86-32 ++# freebsd + # linux-x86-64 + # win32-cygwin + # solaris9-sparc-64 + # macosx + # solaris8 +-PLATFORM = linux-x86-32 ++PLATFORM = freebsd + + # 'Makefile.version' defines the $(VERSION) of the library, and also + # setup the OBJS variable - stuff to be compiled. +@@ -39,7 +39,7 @@ + INCLUDE = -I/usr/include/libxml2 + + # Add for libxml2 if not in above location +-#CFLAGS += `xml2-config --cflags` ++CFLAGS += `xml2-config --cflags` + + # CXX, CFLAGS, LIBS, LDFLAGS, LDFLAGSSO + include Makefile.Defines.$(PLATFORM) +@@ -96,9 +96,9 @@ install: all @mkdir -p $(DESTDIR)/$(PREFIX)/lib @@ -12,7 +35,7 @@ @rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/SSLSocket.* @rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsGetSocket.* @rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/HttpsSocket.* -@@ -106,12 +106,12 @@ +@@ -112,12 +112,12 @@ @rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Min*Handler.h @rm -f $(DESTDIR)/$(PREFIX)/include/$(NAME)/Uid.h @mkdir -p $(DESTDIR)/$(PREFIX)/bin @@ -27,4 +50,4 @@ + @${BSD_INSTALL_DATA} pkgconfig/*pc $(DESTDIR)/$(PREFIX)/libdata/pkgconfig rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so.$(MAJOR) - ln -s $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so + ln -s lib$(NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so Modified: head/net/Sockets/files/patch-Sockets-config.cpp ============================================================================== --- head/net/Sockets/files/patch-Sockets-config.cpp Sun Aug 18 19:19:11 2013 (r324933) +++ head/net/Sockets/files/patch-Sockets-config.cpp Sun Aug 18 20:35:21 2013 (r324934) @@ -1,11 +1,12 @@ --- Sockets-config.cpp.orig 2012-12-29 14:24:51.000000000 +0100 +++ Sockets-config.cpp 2012-12-29 14:25:16.000000000 +0100 -@@ -29,7 +29,7 @@ +@@ -29,8 +29,8 @@ // ------------------------------------------------------------------ static bool any_set = false; -static std::map<std::string, std::string> mmap; +static std::map<std::string, std::string> sockets_mmap; + static bool quiet = false; // ------------------------------------------------------------------ void show_info() Modified: head/net/Sockets/pkg-plist ============================================================================== --- head/net/Sockets/pkg-plist Sun Aug 18 19:19:11 2013 (r324933) +++ head/net/Sockets/pkg-plist Sun Aug 18 20:35:21 2013 (r324934) @@ -71,6 +71,6 @@ libdata/pkgconfig/libsockets2.pc lib/libSockets.a lib/libSockets.so lib/libSockets.so.2 -lib/libSockets.so.2.3.9.7 +lib/libSockets.so.2.3.9.9 @dirrm include/Sockets @dirrmtry lib/pkgconfig _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!