update to xmlrpc-epi-0.54.1
This commit is contained in:
parent
1fc7f3a7df
commit
e965f42395
@ -1,16 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.14 2015/03/16 18:07:53 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.15 2016/01/01 13:04:43 jasper Exp $
|
||||
|
||||
COMMENT= XML-RPC C/C++ client-server implementation
|
||||
CATEGORIES= net devel textproc
|
||||
|
||||
DISTNAME= xmlrpc-epi-0.51
|
||||
REVISION= 3
|
||||
DISTNAME= xmlrpc-epi-0.54.1
|
||||
SHARED_LIBS += xmlrpc-epi 0.3
|
||||
|
||||
HOMEPAGE= http://xmlrpc-epi.sourceforge.net/
|
||||
|
||||
WANTLIB += c expat
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-epi/}
|
||||
|
||||
# BSD
|
||||
@ -18,18 +15,19 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
MODULES= converters/libiconv
|
||||
|
||||
WANTLIB += c expat
|
||||
|
||||
BUILD_DEPENDS += devel/gettext
|
||||
RUN_DEPENDS += devel/gettext
|
||||
|
||||
CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_STYLE= gnu
|
||||
USE_GMAKE= Yes
|
||||
|
||||
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -liconv"
|
||||
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib -liconv"
|
||||
|
||||
CONFIGURE_ARGS+= --includedir=${LOCALBASE}/include/xmlrpc-epi
|
||||
|
||||
post-extract:
|
||||
rm -rf ${WRKSRC}/expat
|
||||
WRKDIST = ${WRKDIR}/xmlrpc
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (xmlrpc-epi-0.51.tar.gz) = 7J5U5y5ws41RXW/Gm01ZHtYBi2XZQJll36zc0fWdE7M=
|
||||
SIZE (xmlrpc-epi-0.51.tar.gz) = 458208
|
||||
SHA256 (xmlrpc-epi-0.54.1.tar.gz) = +j0GNzOPIn3AHZ6pvOEiW5JWGL0vNr7nhGtpAQHeA4o=
|
||||
SIZE (xmlrpc-epi-0.54.1.tar.gz) = 913402
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/02/08 03:23:35 todd Exp $
|
||||
--- Makefile.in.orig Thu Feb 1 23:16:01 2007
|
||||
+++ Makefile.in Thu Feb 1 23:16:08 2007
|
||||
@@ -77,7 +77,7 @@ RANLIB = @RANLIB@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
|
||||
-SUBDIRS = expat src sample
|
||||
+SUBDIRS = src sample
|
||||
|
||||
CHANGE_LOG_GEN_BIN = scripts/cvs2cl.pl
|
||||
CHANGE_LOG_GEN_FLAGS = -t -r -b --accum -I ChangeLog --gmt --prune
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1.1.1 2007/02/08 03:23:35 todd Exp $
|
||||
--- configure.in.orig Thu Feb 1 23:14:28 2007
|
||||
+++ configure.in Thu Feb 1 23:14:39 2007
|
||||
@@ -36,7 +36,7 @@ AC_FUNC_STRFTIME
|
||||
|
||||
AC_CHECK_FUNCS(mktime strstr)
|
||||
|
||||
-AC_OUTPUT(src/Makefile Makefile sample/Makefile expat/Makefile expat/xmltok/Makefile expat/xmlparse/Makefile)
|
||||
+AC_OUTPUT(src/Makefile Makefile sample/Makefile)
|
||||
|
||||
|
||||
|
@ -1,73 +0,0 @@
|
||||
$OpenBSD: patch-sample_Makefile_in,v 1.3 2010/05/22 13:22:53 espie Exp $
|
||||
--- sample/Makefile.in.orig Mon Jun 24 01:48:29 2002
|
||||
+++ sample/Makefile.in Sat May 22 15:16:29 2010
|
||||
@@ -82,25 +82,25 @@ INCLUDES = -I../src -I../expat/xmltok -I../expat/xmlpa
|
||||
bin_PROGRAMS = sample client server server_compliance_test memtest hello_client hello_server
|
||||
|
||||
sample_SOURCES = sample.c
|
||||
-sample_LDADD = -L@prefix@/lib ../src/libxmlrpc.la
|
||||
+sample_LDADD = -L@prefix@/lib ../src/libxmlrpc-epi.la
|
||||
|
||||
client_SOURCES = client.c
|
||||
-client_LDADD = -L@prefix@/lib ../src/libxmlrpc.la
|
||||
+client_LDADD = -L@prefix@/lib ../src/libxmlrpc-epi.la
|
||||
|
||||
server_SOURCES = server.c
|
||||
-server_LDADD = -L@prefix@/lib ../src/libxmlrpc.la
|
||||
+server_LDADD = -L@prefix@/lib ../src/libxmlrpc-epi.la
|
||||
|
||||
hello_client_SOURCES = hello_client.c
|
||||
-hello_client_LDADD = -L@prefix@/lib ../src/libxmlrpc.la
|
||||
+hello_client_LDADD = -L@prefix@/lib ../src/libxmlrpc-epi.la
|
||||
|
||||
hello_server_SOURCES = hello_server.c
|
||||
-hello_server_LDADD = -L@prefix@/lib ../src/libxmlrpc.la
|
||||
+hello_server_LDADD = -L@prefix@/lib ../src/libxmlrpc-epi.la
|
||||
|
||||
server_compliance_test_SOURCES = server_compliance_test.c
|
||||
-server_compliance_test_LDADD = -L@prefix@/lib ../src/libxmlrpc.la
|
||||
+server_compliance_test_LDADD = -L@prefix@/lib ../src/libxmlrpc-epi.la
|
||||
|
||||
memtest_SOURCES = memtest.c
|
||||
-memtest_LDADD = -L@prefix@/lib ../src/libxmlrpc.la
|
||||
+memtest_LDADD = -L@prefix@/lib ../src/libxmlrpc-epi.la
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_CLEAN_FILES =
|
||||
bin_PROGRAMS = sample$(EXEEXT) client$(EXEEXT) server$(EXEEXT) \
|
||||
@@ -111,28 +111,28 @@ PROGRAMS = $(bin_PROGRAMS)
|
||||
|
||||
DEFS = @DEFS@ -I. -I$(srcdir)
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
-LDFLAGS = @LDFLAGS@
|
||||
+LDFLAGS = @LDFLAGS@ -liconv
|
||||
LIBS = @LIBS@
|
||||
sample_OBJECTS = sample.$(OBJEXT)
|
||||
-sample_DEPENDENCIES = ../src/libxmlrpc.la
|
||||
+sample_DEPENDENCIES = ../src/libxmlrpc-epi.la
|
||||
sample_LDFLAGS =
|
||||
client_OBJECTS = client.$(OBJEXT)
|
||||
-client_DEPENDENCIES = ../src/libxmlrpc.la
|
||||
+client_DEPENDENCIES = ../src/libxmlrpc-epi.la
|
||||
client_LDFLAGS =
|
||||
server_OBJECTS = server.$(OBJEXT)
|
||||
-server_DEPENDENCIES = ../src/libxmlrpc.la
|
||||
+server_DEPENDENCIES = ../src/libxmlrpc-epi.la
|
||||
server_LDFLAGS =
|
||||
server_compliance_test_OBJECTS = server_compliance_test.$(OBJEXT)
|
||||
-server_compliance_test_DEPENDENCIES = ../src/libxmlrpc.la
|
||||
+server_compliance_test_DEPENDENCIES = ../src/libxmlrpc-epi.la
|
||||
server_compliance_test_LDFLAGS =
|
||||
memtest_OBJECTS = memtest.$(OBJEXT)
|
||||
-memtest_DEPENDENCIES = ../src/libxmlrpc.la
|
||||
+memtest_DEPENDENCIES = ../src/libxmlrpc-epi.la
|
||||
memtest_LDFLAGS =
|
||||
hello_client_OBJECTS = hello_client.$(OBJEXT)
|
||||
-hello_client_DEPENDENCIES = ../src/libxmlrpc.la
|
||||
+hello_client_DEPENDENCIES = ../src/libxmlrpc-epi.la
|
||||
hello_client_LDFLAGS =
|
||||
hello_server_OBJECTS = hello_server.$(OBJEXT)
|
||||
-hello_server_DEPENDENCIES = ../src/libxmlrpc.la
|
||||
+hello_server_DEPENDENCIES = ../src/libxmlrpc-epi.la
|
||||
hello_server_LDFLAGS =
|
||||
CFLAGS = @CFLAGS@
|
||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
@ -1,77 +0,0 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.3 2010/05/22 13:22:53 espie Exp $
|
||||
--- src/Makefile.in.orig Mon Jun 24 01:48:29 2002
|
||||
+++ src/Makefile.in Sat May 22 15:16:29 2010
|
||||
@@ -75,16 +75,15 @@ RANLIB = @RANLIB@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
|
||||
-INCLUDES = -I../liblm -I../expat/xmltok -I../expat/xmlparse -I/usr/local/ssl/include
|
||||
+INCLUDES = -I../liblm
|
||||
|
||||
-lib_LTLIBRARIES = libxmlrpc.la
|
||||
+lib_LTLIBRARIES = libxmlrpc-epi.la
|
||||
|
||||
-libxmlrpc_la_LIBADD = ../expat/xmltok/libexpat_tok.la ../expat/xmlparse/libexpat_parse.la
|
||||
|
||||
-libxmlrpc_la_SOURCES = base64.c encodings.c queue.c simplestring.c xml_element.c xml_to_dandarpc.c xml_to_xmlrpc.c xml_to_soap.c xmlrpc.c xmlrpc_introspection.c system_methods.c
|
||||
+libxmlrpc-epi_la_SOURCES = base64.c encodings.c queue.c simplestring.c xml_element.c xml_to_dandarpc.c xml_to_xmlrpc.c xml_to_soap.c xmlrpc.c xmlrpc_introspection.c system_methods.c
|
||||
|
||||
|
||||
-libxmlrpc_la_LDFLAGS = -version-info 0:3:0
|
||||
+libxmlrpc-epi_la_LDFLAGS = -version-info 0:3:0
|
||||
include_HEADERS = base64.h encodings.h queue.h simplestring.h xml_element.h xml_to_xmlrpc.h xmlrpc.h xmlrpc_introspection.h
|
||||
|
||||
|
||||
@@ -95,7 +94,7 @@ ROBOOPTS = C SORT
|
||||
|
||||
# Your source files.
|
||||
#
|
||||
-DOCSOURCES = $(include_HEADERS) $(libxmlrpc_la_SOURCES)
|
||||
+DOCSOURCES = $(include_HEADERS) $(libxmlrpc-epi_la_SOURCES)
|
||||
|
||||
|
||||
# The name of your Project
|
||||
@@ -128,18 +127,16 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||
|
||||
DEFS = @DEFS@ -I. -I$(srcdir)
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
-LDFLAGS = @LDFLAGS@
|
||||
+LDFLAGS = @LDFLAGS@ -liconv -lexpat
|
||||
LIBS = @LIBS@
|
||||
-libxmlrpc_la_DEPENDENCIES = ../expat/xmltok/libexpat_tok.la \
|
||||
-../expat/xmlparse/libexpat_parse.la
|
||||
-libxmlrpc_la_OBJECTS = base64.lo encodings.lo queue.lo simplestring.lo \
|
||||
+libxmlrpc-epi_la_OBJECTS = base64.lo encodings.lo queue.lo simplestring.lo \
|
||||
xml_element.lo xml_to_dandarpc.lo xml_to_xmlrpc.lo xml_to_soap.lo \
|
||||
xmlrpc.lo xmlrpc_introspection.lo system_methods.lo
|
||||
CFLAGS = @CFLAGS@
|
||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
CCLD = $(CC)
|
||||
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -liconv -o $@
|
||||
HEADERS = $(include_HEADERS)
|
||||
|
||||
DIST_COMMON = README Makefile.am Makefile.in
|
||||
@@ -153,8 +150,8 @@ DEP_FILES = .deps/base64.P .deps/encodings.P .deps/qu
|
||||
.deps/simplestring.P .deps/system_methods.P .deps/xml_element.P \
|
||||
.deps/xml_to_dandarpc.P .deps/xml_to_soap.P .deps/xml_to_xmlrpc.P \
|
||||
.deps/xmlrpc.P .deps/xmlrpc_introspection.P
|
||||
-SOURCES = $(libxmlrpc_la_SOURCES)
|
||||
-OBJECTS = $(libxmlrpc_la_OBJECTS)
|
||||
+SOURCES = $(libxmlrpc-epi_la_SOURCES)
|
||||
+OBJECTS = $(libxmlrpc-epi_la_OBJECTS)
|
||||
|
||||
all: all-redirect
|
||||
.SUFFIXES:
|
||||
@@ -230,8 +227,8 @@ distclean-libtool:
|
||||
|
||||
maintainer-clean-libtool:
|
||||
|
||||
-libxmlrpc.la: $(libxmlrpc_la_OBJECTS) $(libxmlrpc_la_DEPENDENCIES)
|
||||
- $(LINK) -rpath $(libdir) $(libxmlrpc_la_LDFLAGS) $(libxmlrpc_la_OBJECTS) $(libxmlrpc_la_LIBADD) $(LIBS)
|
||||
+libxmlrpc-epi.la: $(libxmlrpc-epi_la_OBJECTS) $(libxmlrpc-epi_la_DEPENDENCIES)
|
||||
+ $(LINK) -rpath $(libdir) $(libxmlrpc-epi_la_LDFLAGS) $(libxmlrpc-epi_la_OBJECTS) $(libxmlrpc-epi_la_LIBADD) $(LIBS)
|
||||
|
||||
install-includeHEADERS: $(include_HEADERS)
|
||||
@$(NORMAL_INSTALL)
|
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-src_xml_element_c,v 1.2 2010/05/22 13:22:53 espie Exp $
|
||||
--- src/xml_element.c.orig Thu May 23 19:46:51 2002
|
||||
+++ src/xml_element.c Sat May 22 15:19:57 2010
|
||||
@@ -88,10 +88,10 @@ static const char rcsid[] = "#(@) $Id: xml_element.c,v
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
+#include <expat.h>
|
||||
|
||||
#include "xml_element.h"
|
||||
#include "queue.h"
|
||||
-#include "xmlparse.h"
|
||||
#include "encodings.h"
|
||||
|
||||
#define my_free(thing) if(thing) {free(thing); thing = 0;}
|
||||
@@ -170,7 +170,7 @@ void xml_elem_free_non_recurse(xml_element* root) {
|
||||
|
||||
Q_Destroy(&root->children);
|
||||
Q_Destroy(&root->attrs);
|
||||
- my_free((char*)root->name);
|
||||
+ my_free(root->name);
|
||||
simplestring_free(&root->text);
|
||||
my_free(root);
|
||||
}
|
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-src_xmlrpc_c,v 1.1.1.1 2007/02/08 03:23:35 todd Exp $
|
||||
--- src/xmlrpc.c.orig Wed Feb 7 18:45:59 2007
|
||||
+++ src/xmlrpc.c Wed Feb 7 18:46:16 2007
|
||||
@@ -117,10 +117,10 @@ static const char rcsid[] =
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <time.h>
|
||||
+#include <expat.h>
|
||||
|
||||
#include "queue.h"
|
||||
#include "xmlrpc.h"
|
||||
-#include "xmlparse.h"
|
||||
#include "base64.h"
|
||||
|
||||
#include "xml_to_xmlrpc.h"
|
Loading…
Reference in New Issue
Block a user