Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
sambuc
2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
textproc/xmlrpc-c/patches/patch-GNUmakefile
+11 -1
View File
@@ -1,6 +1,7 @@
$NetBSD: patch-GNUmakefile,v 1.1 2011/11/22 19:17:19 yyamano Exp $
$NetBSD: patch-GNUmakefile,v 1.2 2013/09/12 18:52:54 adam Exp $
Make this build with symlinked pkgsrc directory.
Don't build examples: they are not installed, and give error with libc++.
--- GNUmakefile.orig 2011-03-25 16:27:18.000000000 +0000
+++ GNUmakefile
@@ -12,3 +13,12 @@ Make this build with symlinked pkgsrc directory.
SUBDIR =
export SRCDIR
@@ -8,7 +8,7 @@ export BLDDIR
include $(BLDDIR)/config.mk
-SUBDIRS = include lib src tools examples
+SUBDIRS = include lib src tools
# The reason we don't build tools and examples by default is that they
# contain executables, which require significantly more from the
textproc/xmlrpc-c/patches/patch-ac
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-ac,v 1.4 2011/04/06 07:45:48 adam Exp $
--- src/cpp/Makefile.orig 2011-03-25 16:58:35.000000000 +0000
+++ src/cpp/Makefile
@@ -283,7 +283,7 @@ $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.o) \
$(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh): \
INCLUDES = $(BASIC_INCLUDES)
-CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
+CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_SHLIB) $(CFLAGS_PERSONAL) $(CADD)
TRANSPORT_CONFIG_USERS = client curl libwww wininet
textproc/xmlrpc-c/patches/patch-ai
+4 -4
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-ai,v 1.2 2011/04/06 07:45:48 adam Exp $
$NetBSD: patch-ai,v 1.3 2013/09/12 18:52:54 adam Exp $
--- tools/xmlrpc/Makefile.orig 2011-03-25 16:58:35.000000000 +0000
--- tools/xmlrpc/Makefile.orig 2013-03-29 06:38:36.000000000 +0000
+++ tools/xmlrpc/Makefile
@@ -45,7 +45,7 @@ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC)
@@ -43,7 +43,7 @@ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC)
XMLRPC_OBJS = xmlrpc.o $(DUMPVALUE)
xmlrpc: $(XMLRPC_OBJS) $(LIBS) $(UTILS)
@@ -10,4 +10,4 @@ $NetBSD: patch-ai,v 1.2 2011/04/06 07:45:48 adam Exp $
+ libtool --mode=link $(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS)
%.o:%.c $(BLDDIR)/include/xmlrpc-c/config.h
$(CC) -c $(CFLAGS) $<
$(CC) -c $(CFLAGS_ALL) $<
textproc/xmlrpc-c/patches/patch-aj
+4 -4
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-aj,v 1.2 2011/04/06 07:45:48 adam Exp $
$NetBSD: patch-aj,v 1.3 2013/09/12 18:52:54 adam Exp $
--- tools/xmlrpc_transport/Makefile.orig 2011-03-25 16:58:35.000000000 +0000
--- tools/xmlrpc_transport/Makefile.orig 2013-03-29 06:38:36.000000000 +0000
+++ tools/xmlrpc_transport/Makefile
@@ -45,7 +45,7 @@ UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%)
@@ -36,7 +36,7 @@ UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%)
LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) $(LIBXMLRPC_XML) $(LIBXMLRPC_UTIL)
xmlrpc_transport:%:%.o $(LIBS) $(UTILS)
@@ -10,4 +10,4 @@ $NetBSD: patch-aj,v 1.2 2011/04/06 07:45:48 adam Exp $
+ libtool --mode=link $(CCLD) -o $@ $(LDFLAGS) $< $(CLIENT_LDLIBS) $(UTILS)
%.o:%.c
$(CC) -c $(CFLAGS) $<
$(CC) -c $(CFLAGS_ALL) $<
textproc/xmlrpc-c/patches/patch-ak
+3 -3
View File
@@ -1,6 +1,6 @@
$NetBSD: patch-ak,v 1.2 2011/04/06 07:45:48 adam Exp $
$NetBSD: patch-ak,v 1.3 2013/09/12 18:52:54 adam Exp $
--- tools/xml-rpc-api2cpp/Makefile.orig 2011-03-25 16:58:35.000000000 +0000
--- tools/xml-rpc-api2cpp/Makefile.orig 2013-03-29 06:38:36.000000000 +0000
+++ tools/xml-rpc-api2cpp/Makefile
@@ -44,7 +44,7 @@ xml-rpc-api2cpp: \
$(LIBXMLRPC) \
@@ -10,4 +10,4 @@ $NetBSD: patch-ak,v 1.2 2011/04/06 07:45:48 adam Exp $
+ libtool --mode=link $(CXXLD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS)
%.o:%.cpp
$(CXX) -c $(CXXFLAGS) $<
$(CXX) -c $(CXXFLAGS_ALL) $<
textproc/xmlrpc-c/patches/patch-config.mk.in
+24 -10
View File
@@ -1,14 +1,16 @@
$NetBSD: patch-config.mk.in,v 1.2 2013/01/05 10:37:56 ryoon Exp $
$NetBSD: patch-config.mk.in,v 1.4 2013/12/01 23:25:31 bsiegert Exp $
Do not use -Bdynamic -G when using GCC on Solaris, it creates non-PIC
libraries.
--- config.mk.in.orig 2011-03-25 16:58:35.000000000 +0000
Support for shared libraries on OpenBSD and MirBSD.
--- config.mk.in.orig Fri Mar 29 06:38:11 2013
+++ config.mk.in
@@ -187,10 +187,15 @@ ifeq ($(patsubst solaris%,solaris,$(HOST
SHLIB_SUFFIX = so
shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
@@ -193,10 +193,15 @@ ifeq ($(patsubst solaris%,solaris,$(HOST
# linker, it's even more complicated: we need an rpath option of the
# form -Wl,-R .
- # Solaris compiler (Sun C 5.5) can't take multiple ld options as
- # -Wl,-a,-b . Ld sees -a,-b in that case.
- LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME)
@@ -22,13 +24,24 @@ libraries.
+ LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME)
+ CFLAGS_SHLIB = -Kpic
+ endif
NEED_RPATH=yes
endif
ifeq ($(patsubst aix%,aix,$(HOST_OS)),aix)
@@ -235,6 +240,18 @@ ifeq ($(patsubst netbsd%,netbsd,$(HOST_O
NEED_WL_RPATH=yes
@@ -231,6 +236,30 @@ ifeq ($(patsubst osf%,osf,$(HOST_OS)),os
endif
ifeq ($(patsubst netbsd%,netbsd,$(HOST_OS)),netbsd)
+ SHARED_LIB_TYPE = unix
+ SHLIB_SUFFIX = so
+ MUST_BUILD_SHLIB = Y
+ MUST_BUILD_SHLIBLE = Y
+ shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
+ shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
+ CFLAGS_SHLIB = -fpic
+ LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
+ NEED_WL_RPATH=yes
+endif
+
+ifeq ($(patsubst openbsd%,openbsd,$(HOST_OS)),openbsd)
+ SHARED_LIB_TYPE = unix
+ SHLIB_SUFFIX = so
@@ -41,6 +54,7 @@ libraries.
+ NEED_WL_RPATH=yes
+endif
+
ifeq ($(patsubst freebsd%,freebsd,$(HOST_OS)),freebsd)
+ifeq ($(patsubst mirbsd%,mirbsd,$(HOST_OS)),mirbsd)
SHARED_LIB_TYPE = unix
SHLIB_SUFFIX = so
MUST_BUILD_SHLIB = Y
textproc/xmlrpc-c/patches/patch-examples_cpp_Makefile
-36
View File
@@ -1,36 +0,0 @@
$NetBSD: patch-examples_cpp_Makefile,v 1.1 2012/04/25 17:52:59 hans Exp $
--- examples/cpp/Makefile.orig 2011-03-25 17:58:35.000000000 +0100
+++ examples/cpp/Makefile 2012-04-25 17:31:34.833338175 +0200
@@ -75,26 +75,26 @@ LIBS_BASE = \
all: $(PROGS)
$(SERVERPROGS_CGI):%.cgi:%_cgi.o
- $(CXXLD) -o $@ $^ $(LIBS_SERVER_CGI) $(LDFLAGS)
+ $(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_SERVER_CGI)
$(SERVERPROGS_ABYSS):%:%.o
- $(CXXLD) -o $@ $^ $(LIBS_SERVER_ABYSS) $(LDFLAGS)
+ $(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_SERVER_ABYSS)
$(CLIENTPROGS):%:%.o
- $(CXXLD) -o $@ $^ $(LIBS_CLIENT) $(LDFLAGS)
+ $(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_CLIENT)
LIBS_PSTREAM_CLIENT = \
$(shell $(XMLRPC_C_CONFIG) c++2 client --libs)
pstream_client:%:%.o
- $(CXXLD) -o $@ $^ $(LIBS_PSTREAM_CLIENT) $(LDFLAGS)
+ $(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_PSTREAM_CLIENT)
LIBS_PSTREAM_SERVER = \
$(shell $(XMLRPC_C_CONFIG) c++2 pstream-server --libs)
pstream_inetd_server:%:%.o
- $(CXXLD) -o $@ $^ $(LIBS_PSTREAM_SERVER) $(LDFLAGS)
+ $(CXXLD) -o $@ $(LDFLAGS) $^ $(LIBS_PSTREAM_SERVER)
OBJECTS = $(patsubst %,%.o,$(patsubst %.cgi,%_cgi,$(PROGS)))
textproc/xmlrpc-c/patches/patch-lib_curl__transport_curlmulti.c
-14
View File
@@ -1,14 +0,0 @@
$NetBSD: patch-lib_curl__transport_curlmulti.c,v 1.1 2011/06/30 01:03:25 obache Exp $
* curl/types.h is not used (empty) since curl-7.12.0 and removed at curl-7.21.7.
--- lib/curl_transport/curlmulti.c.orig 2011-03-25 16:24:54.000000000 +0000
+++ lib/curl_transport/curlmulti.c
@@ -17,7 +17,6 @@
#endif
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
#include <curl/multi.h>
textproc/xmlrpc-c/patches/patch-lib_curl__transport_curltransaction.c
-14
View File
@@ -1,14 +0,0 @@
$NetBSD: patch-lib_curl__transport_curltransaction.c,v 1.1 2011/06/30 01:03:26 obache Exp $
* curl/types.h is not used (empty) since curl-7.12.0 and removed at curl-7.21.7.
--- lib/curl_transport/curltransaction.c.orig 2011-03-25 16:24:56.000000000 +0000
+++ lib/curl_transport/curltransaction.c
@@ -15,7 +15,6 @@
#include "version.h"
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
#include "curlversion.h"
textproc/xmlrpc-c/patches/patch-lib_curl__transport_xmlrpc__curl__transport.c
-14
View File
@@ -1,14 +0,0 @@
$NetBSD: patch-lib_curl__transport_xmlrpc__curl__transport.c,v 1.1 2011/06/30 01:03:26 obache Exp $
* curl/types.h is not used (empty) since curl-7.12.0 and removed at curl-7.21.7.
--- lib/curl_transport/xmlrpc_curl_transport.c.orig 2011-03-25 16:24:55.000000000 +0000
+++ lib/curl_transport/xmlrpc_curl_transport.c
@@ -83,7 +83,6 @@
#include "xmlrpc-c/time_int.h"
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
#include <curl/multi.h>
textproc/xmlrpc-c/patches/patch-src_cpp_server_pstream.cpp
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-src_cpp_server_pstream.cpp,v 1.1 2013/12/01 23:25:31 bsiegert Exp $
Socket functions need sys/types.h on MirBSD.
--- src/cpp/server_pstream.cpp.orig Thu Sep 19 12:47:06 2013
+++ src/cpp/server_pstream.cpp
@@ -22,6 +22,7 @@
#include <winsock.h>
typedef int socklen_t;
#else
+#include <sys/types.h>
#include <sys/socket.h>
#endif
#include <errno.h>