summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/swill/Makefile21
-rw-r--r--www/swill/PLIST7
-rw-r--r--www/swill/buildlink3.mk12
-rw-r--r--www/swill/distinfo18
-rw-r--r--www/swill/patches/patch-Makefile.in47
-rw-r--r--www/swill/patches/patch-Makefile_in15
-rw-r--r--www/swill/patches/patch-Source_Objects_Makefile.in15
-rw-r--r--www/swill/patches/patch-Source_Objects_base_c20
-rw-r--r--www/swill/patches/patch-Source_SWILL_Makefile.in49
-rw-r--r--www/swill/patches/patch-aa14
-rw-r--r--www/swill/patches/patch-ab23
11 files changed, 159 insertions, 82 deletions
diff --git a/www/swill/Makefile b/www/swill/Makefile
index 67e2b358346..544d3ff2f84 100644
--- a/www/swill/Makefile
+++ b/www/swill/Makefile
@@ -1,18 +1,25 @@
-# $NetBSD: Makefile,v 1.13 2012/10/28 06:31:06 asau Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/11 12:51:15 schmonz Exp $
-DISTNAME= swill-0.3
-PKGREVISION= 1
+GITHUB_PROJECT= swill
+DISTNAME= fafde7646c39bfc3b30521dbcda9efaa94396b0e
+PKGNAME= swill-0.3
+PKGREVISION= 2
CATEGORIES= www devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=swill/}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= ${MASTER_SITE_GITHUB:=dspinellis/}
+DIST_SUBDIR= ${GITHUB_PROJECT}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://swill.sourceforge.net/
+HOMEPAGE= https://github.com/dspinellis/swill/
COMMENT= The Simple Web Interface Link Library
LICENSE= gnu-lgpl-v2.1
-WRKSRC= ${WRKDIR}/SWILL-0.3
+WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${DISTNAME}
+
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --without-mpi
+USE_LIBTOOL= yes
INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
+INSTALLATION_DIRS= include lib
+
.include "../../mk/bsd.pkg.mk"
diff --git a/www/swill/PLIST b/www/swill/PLIST
index 59bebeb6eed..24a1a95a31a 100644
--- a/www/swill/PLIST
+++ b/www/swill/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2009/07/16 22:12:20 obache Exp $
-include/swill/swill.h
-lib/libswill.a
-lib/libswill.so
+@comment $NetBSD: PLIST,v 1.4 2016/08/11 12:51:15 schmonz Exp $
+include/swill.h
+lib/libswill.la
diff --git a/www/swill/buildlink3.mk b/www/swill/buildlink3.mk
new file mode 100644
index 00000000000..61a7acdbfdf
--- /dev/null
+++ b/www/swill/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2016/08/11 12:51:15 schmonz Exp $
+
+BUILDLINK_TREE+= swill
+
+.if !defined(SWILL_BUILDLINK3_MK)
+SWILL_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.swill+= swill>=0.3nb2
+BUILDLINK_PKGSRCDIR.swill?= ../../www/swill
+.endif # SWILL_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -swill
diff --git a/www/swill/distinfo b/www/swill/distinfo
index 93b73690349..6caf190f592 100644
--- a/www/swill/distinfo
+++ b/www/swill/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 02:47:39 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/08/11 12:51:15 schmonz Exp $
-SHA1 (swill-0.3.tgz) = 765a15c22ef527a811c41c3a2fd25199c979e298
-RMD160 (swill-0.3.tgz) = 72134ac3213b6e8df3cf5c7d3d73a2378e9f5659
-SHA512 (swill-0.3.tgz) = 08d1f0fd8832c981580a1508e752b34740661943b276119615dac0a81afdc26f598c7174d4796b56c8941438b0a6d5e6c9b6f94369075d796c23bd274af52c71
-Size (swill-0.3.tgz) = 438745 bytes
-SHA1 (patch-Makefile_in) = 4e484d79b63edd74e990caf0b7556645f2d8fac8
-SHA1 (patch-Source_Objects_base_c) = 710bcee4dddbc2178b5c00d5f4827e54fdc2831b
-SHA1 (patch-aa) = a2bdde8349e57f6d6440ce4ed02a246353dc6d93
-SHA1 (patch-ab) = c855874bfb3df83a8218ff099e52cede9ebd4478
+SHA1 (swill/fafde7646c39bfc3b30521dbcda9efaa94396b0e.tar.gz) = 1628126f9629b1cf78a1e8d8b7bb0296b9085e9c
+RMD160 (swill/fafde7646c39bfc3b30521dbcda9efaa94396b0e.tar.gz) = d422a9999ea1168f116d95ec5be60ab24966988b
+SHA512 (swill/fafde7646c39bfc3b30521dbcda9efaa94396b0e.tar.gz) = dd8867b497dd7e3ac661c06b4301e056a10efb81b23e6573677fd7b3d0015600d28f0cf15428b84f0f4490efb8fb37cf9e4457cc3d68feac9175147186130672
+Size (swill/fafde7646c39bfc3b30521dbcda9efaa94396b0e.tar.gz) = 119204 bytes
+SHA1 (patch-Makefile.in) = eedb76e89aee76b29a9d25cd47c4c0c3929cedf0
+SHA1 (patch-Source_Objects_Makefile.in) = 963125eb9edc293a34923f818ec1472f44d5beb2
+SHA1 (patch-Source_Objects_base_c) = ac8d6bee14f6db5bdbe38c33b6e0d46fc457a12b
+SHA1 (patch-Source_SWILL_Makefile.in) = 5b39b5292a3ae19c7a3e636027c91f828ee3edf1
diff --git a/www/swill/patches/patch-Makefile.in b/www/swill/patches/patch-Makefile.in
new file mode 100644
index 00000000000..fc5a8f4628c
--- /dev/null
+++ b/www/swill/patches/patch-Makefile.in
@@ -0,0 +1,47 @@
+$NetBSD: patch-Makefile.in,v 1.1 2016/08/11 12:51:15 schmonz Exp $
+
+Libtoolize.
+
+--- Makefile.in.orig 2016-01-16 13:37:22.000000000 +0000
++++ Makefile.in
+@@ -15,35 +15,26 @@ RANLIB = @RANLIB@
+
+ # Installer
+
+-INSTALL = ./install-sh -c
++INSTALL = install -c
+ INSTALL_DATA = ${INSTALL} -m 644
+ INSTALL_PROGRAM= ${INSTALL} -m 755
+
+-all: static
++all: shared
+
+ static:
+ cd Source/Objects; $(MAKE)
+- cd Source/SWILL; $(MAKE) static
+
+-shared:
++shared: static
+ cd Source/SWILL; $(MAKE) shared
+
+ install:
+- @for i in *@SO@; \
++ @cd Source/SWILL && for i in *.la; \
+ do \
+ if test -f $$i; then \
+ echo "Installing $(LIB_DIR)/$$i"; \
+- $(INSTALL_PROGRAM) $$i $(LIB_DIR)/$$i; \
++ libtool --mode=install $(INSTALL_PROGRAM) $$i $(LIB_DIR)/$$i; \
+ fi; \
+ done;
+- @for i in *.a; \
+- do \
+- if test -f $$i; then \
+- echo "Installing $(LIB_DIR)/$$i"; \
+- $(INSTALL_DATA) $$i $(LIB_DIR)/$$i; \
+- $(RANLIB) $(LIB_DIR)/$$i; \
+- fi; \
+- done;
+
+ @echo "Installing $(INCLUDE_DIR)/swill.h..."
+ @$(INSTALL_DATA) Include/swill.h $(INCLUDE_DIR)/swill.h
diff --git a/www/swill/patches/patch-Makefile_in b/www/swill/patches/patch-Makefile_in
deleted file mode 100644
index 0e1d4436f80..00000000000
--- a/www/swill/patches/patch-Makefile_in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile_in,v 1.1 2011/09/29 11:27:07 dholland Exp $
-
-Fix MAKE_JOBS build.
-
---- Makefile.in~ 2007-07-07 04:51:35.000000000 +0000
-+++ Makefile.in
-@@ -53,7 +53,7 @@ install:
- @echo "Installing $(INCLUDE_DIR)/swill/swill.h..."
- @$(INSTALL_DATA) $(SRC_DIR)/Include/swill/swill.h $(INCLUDE_DIR)/swill/swill.h
-
--all: static shared
-+all: static .WAIT shared
-
- localclean:
- rm -rf *.o *.so libswill*
diff --git a/www/swill/patches/patch-Source_Objects_Makefile.in b/www/swill/patches/patch-Source_Objects_Makefile.in
new file mode 100644
index 00000000000..cabfd3fdee8
--- /dev/null
+++ b/www/swill/patches/patch-Source_Objects_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_Objects_Makefile.in,v 1.1 2016/08/11 12:51:15 schmonz Exp $
+
+Libtoolize.
+
+--- Source/Objects/Makefile.in.orig 2016-01-16 13:37:22.000000000 +0000
++++ Source/Objects/Makefile.in
+@@ -37,7 +37,7 @@ SHELL = /bin/sh
+ # Rules for creation of a .o file from .c
+ .SUFFIXES: .c
+ .c.o:
+- $(CC) $(CCSHARED) $(DOHOPT) $(INCLUDE) $(CFLAGS) -c -o $*.o $<
++ libtool --mode=compile --tag=CC $(CC) $(DOHOPT) $(INCLUDE) $(CFLAGS) -c $<
+
+ all: $(LIBOBJS)
+
diff --git a/www/swill/patches/patch-Source_Objects_base_c b/www/swill/patches/patch-Source_Objects_base_c
index 5258a9134c6..28239f86c9a 100644
--- a/www/swill/patches/patch-Source_Objects_base_c
+++ b/www/swill/patches/patch-Source_Objects_base_c
@@ -1,15 +1,15 @@
-$NetBSD: patch-Source_Objects_base_c,v 1.1 2011/09/29 11:27:07 dholland Exp $
+$NetBSD: patch-Source_Objects_base_c,v 1.2 2016/08/11 12:51:15 schmonz Exp $
Use correct printf format. While on the same line, use snprintf.
---- Source/Objects/base.c~ 2007-08-09 15:17:37.000000000 +0000
+--- Source/Objects/base.c.orig 2016-01-16 13:37:22.000000000 +0000
+++ Source/Objects/base.c
@@ -94,7 +94,7 @@ DohStr(const DOH *obj) {
- if (objinfo->doh_str) {
- return (objinfo->doh_str)(b);
- }
-- sprintf(buffer,"<Object '%s' at %x>", objinfo->objname, (unsigned int) b);
-+ snprintf(buffer, sizeof(buffer), "<Object '%s' at %p>", objinfo->objname, b);
- return NewString(buffer);
- } else {
- return NewString(obj);
+ if (objinfo->doh_str) {
+ return (objinfo->doh_str)(b);
+ }
+- sprintf(buffer,"<Object '%s' at %p>", objinfo->objname, b);
++ snprintf(buffer, sizeof(buffer), "<Object '%s' at %p>", objinfo->objname, b);
+ return NewString(buffer);
+ } else {
+ return NewString(obj);
diff --git a/www/swill/patches/patch-Source_SWILL_Makefile.in b/www/swill/patches/patch-Source_SWILL_Makefile.in
new file mode 100644
index 00000000000..9f74b35e6d0
--- /dev/null
+++ b/www/swill/patches/patch-Source_SWILL_Makefile.in
@@ -0,0 +1,49 @@
+$NetBSD: patch-Source_SWILL_Makefile.in,v 1.1 2016/08/11 12:51:15 schmonz Exp $
+
+Libtoolize.
+
+--- Source/SWILL/Makefile.in.orig 2016-01-16 13:37:22.000000000 +0000
++++ Source/SWILL/Makefile.in
+@@ -20,12 +20,12 @@ NETLIBS = @NETLIBS@
+ # Normally, you shouldn't have to change anything below this point #
+ ########################################################################
+
+-LIBOBJS = log.o io.o encoding.o handlers.o mime.o parse.o web.o security.o
++LIBOBJS = log.lo io.lo encoding.lo handlers.lo mime.lo parse.lo web.lo security.lo
+ LIBSRCS = log.c io.c encoding.c handlers.c mime.c parse.c web.c security.c
+
+-DOHOBJS = ../Objects/*.o
++DOHOBJS = ../Objects/*.lo
+ LIBHEADERS = $(srcdir)/../Include/swill.h
+-LIB = libswill@MPISUFFIX@$(SO)
++LIB = libswill@MPISUFFIX@.la
+ SLIB = libswill@MPISUFFIX@.a
+ INCLUDE = -I$(srcdir)/../../Include -I$(srcdir)/../Objects @MPIINCLUDE@
+ CFLAGS = @USEMPI@
+@@ -33,20 +33,20 @@ SHELL = /bin/sh
+
+ #
+ # Rules for creation of a .o file from .cxx
+-.SUFFIXES: .c
+-.c.o:
+- $(CC) $(CCSHARED) $(INCLUDE) $(CFLAGS) -c -o $*.o $<
++.SUFFIXES: .c .lo
++.c.lo:
++ libtool --mode=compile --tag=CC $(CC) $(INCLUDE) $(CFLAGS) -c $<
+
+-all: static shared
++all: shared
+
+ $(SLIB): $(LIBOBJS)
+ @echo "Building static library"
+ $(AR) cr $(SLIB) $(LIBOBJS) $(DOHOBJS)
+ cp -f $(SLIB) ../..
+
+-($LIB): $(LIBOBJS)
++$(LIB): $(LIBOBJS)
+ @echo "Building shared library"
+- $(LDSHARED) $(LIBOBJS) $(DOHOBJS) -o $(LIB) $(NETLIBS)
++ libtool --mode=link --tag=CC ${CC} $(LIBOBJS) $(DOHOBJS) -o $(LIB) $(NETLIBS) -version-info 1:0:0 -rpath $(prefix)/lib
+ cp -f $(LIB) ../..
+
+ static: $(SLIB)
diff --git a/www/swill/patches/patch-aa b/www/swill/patches/patch-aa
deleted file mode 100644
index e75cf523c43..00000000000
--- a/www/swill/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/12/30 13:15:14 obache Exp $
-
-* need to include <sys/socket.h> for socket(2) and related definitions.
-
---- Source/SWILL/sock.c.orig 2008-04-10 03:55:01.000000000 +0000
-+++ Source/SWILL/sock.c
-@@ -24,6 +24,7 @@ static char cvsroot[] = "$Header: /cvsro
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <signal.h>
-+#include <sys/socket.h>
-
- #define comm_errno errno
- #define closesocket(s) close(s)
diff --git a/www/swill/patches/patch-ab b/www/swill/patches/patch-ab
deleted file mode 100644
index caa6a6de08e..00000000000
--- a/www/swill/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/12/30 13:15:14 obache Exp $
-
-* DragonFly support.
-
---- configure.orig 2007-07-10 02:31:37.000000000 +0000
-+++ configure
-@@ -3474,6 +3474,7 @@ then
- dgux*) LDSHARED="ld -G";;
- FreeBSD*/3*) LDSHARED="gcc -shared";;
- FreeBSD*|OpenBSD*) LDSHARED="ld -Bshareable";;
-+ DragonFly*) LDSHARED="cc -shared";;
- NetBSD*)
- if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
- then
-@@ -3514,7 +3515,7 @@ then
- fi;;
- Linux*) CCSHARED="-fpic";;
- FreeBSD*|OpenBSD*) CCSHARED="-fpic";;
-- NetBSD*) CCSHARED="-fPIC";;
-+ NetBSD*|DragonFly*) CCSHARED="-fPIC";;
- SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
- IRIX*/6*) case $CC in
- *gcc*) CCSHARED="-shared";;
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-03 05:12:29 +0000