Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id DBE177A2B2 for ; Thu, 11 Aug 2016 12:51:17 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 86BE285ECA; Thu, 11 Aug 2016 12:51:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 166D485E8C for ; Thu, 11 Aug 2016 12:51:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id tBhM8KUaKufu for ; Thu, 11 Aug 2016 12:51:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3175B85E5B for ; Thu, 11 Aug 2016 12:51:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2BDBDFBC3; Thu, 11 Aug 2016 12:51:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1470919876245730" MIME-Version: 1.0 Date: Thu, 11 Aug 2016 12:51:16 +0000 From: "Amitai Schlair" Subject: CVS commit: pkgsrc/www/swill To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20160811125116.2BDBDFBC3@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1470919876245730 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Thu Aug 11 12:51:16 UTC 2016 Modified Files: pkgsrc/www/swill: Makefile PLIST distinfo pkgsrc/www/swill/patches: patch-Source_Objects_base_c Added Files: pkgsrc/www/swill: buildlink3.mk pkgsrc/www/swill/patches: patch-Makefile.in patch-Source_Objects_Makefile.in patch-Source_SWILL_Makefile.in Removed Files: pkgsrc/www/swill/patches: patch-Makefile_in patch-aa patch-ab Log Message: Update to new upstream. From the git log: * Fix LLVM warnings (HEAD -> master, origin/master, origin/HEAD) * Ignore shared library * Only build libraries if needed * Make configure executable * Add configure script * Update ignored files * Add getpeerip, setfork functions * Make it compile under Windows * Document Cygwin * Changes to compile with a cygwin compiler. * Make it compile with gcc-4 * Fix setfork return type. * Conditionally compile funcitonality that is not part of WIN32. * _exit is a lot more efficient than exit. * Add query string in the log file. * Implement forking server. Add swill_setfork() function. * Add swill_getquerystring function. * Fix SVG mime type. See http://www.mozilla.org/projects/svg/faq.html * Added logging statements for errors. * Add application/svg type for the .svg suffix. * Added swill_getrlen and swill_getrequest functions. * Added conditional compilation directive. * Added char *swill_getpeerip(const char *name) function. * Use scanf %p for portability with 64 bit architectures. * WIN32 port. pkgsrc changes: * Libtoolize to fix build on OS X (and perhaps others). To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/swill/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/swill/PLIST cvs rdiff -u -r0 -r1.1 pkgsrc/www/swill/buildlink3.mk cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/swill/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/www/swill/patches/patch-Makefile.in \ pkgsrc/www/swill/patches/patch-Source_Objects_Makefile.in \ pkgsrc/www/swill/patches/patch-Source_SWILL_Makefile.in cvs rdiff -u -r1.1 -r0 pkgsrc/www/swill/patches/patch-Makefile_in \ pkgsrc/www/swill/patches/patch-aa pkgsrc/www/swill/patches/patch-ab cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/swill/patches/patch-Source_Objects_base_c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1470919876245730 Content-Disposition: inline Content-Length: 9488 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/swill/Makefile diff -u pkgsrc/www/swill/Makefile:1.13 pkgsrc/www/swill/Makefile:1.14 --- pkgsrc/www/swill/Makefile:1.13 Sun Oct 28 06:31:06 2012 +++ pkgsrc/www/swill/Makefile Thu Aug 11 12:51:15 2016 @@ -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" Index: pkgsrc/www/swill/PLIST diff -u pkgsrc/www/swill/PLIST:1.3 pkgsrc/www/swill/PLIST:1.4 --- pkgsrc/www/swill/PLIST:1.3 Thu Jul 16 22:12:20 2009 +++ pkgsrc/www/swill/PLIST Thu Aug 11 12:51:15 2016 @@ -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 Index: pkgsrc/www/swill/distinfo diff -u pkgsrc/www/swill/distinfo:1.6 pkgsrc/www/swill/distinfo:1.7 --- pkgsrc/www/swill/distinfo:1.6 Wed Nov 4 02:47:39 2015 +++ pkgsrc/www/swill/distinfo Thu Aug 11 12:51:15 2016 @@ -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 Index: pkgsrc/www/swill/patches/patch-Source_Objects_base_c diff -u pkgsrc/www/swill/patches/patch-Source_Objects_base_c:1.1 pkgsrc/www/swill/patches/patch-Source_Objects_base_c:1.2 --- pkgsrc/www/swill/patches/patch-Source_Objects_base_c:1.1 Thu Sep 29 11:27:07 2011 +++ pkgsrc/www/swill/patches/patch-Source_Objects_base_c Thu Aug 11 12:51:15 2016 @@ -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,"", objinfo->objname, (unsigned int) b); -+ snprintf(buffer, sizeof(buffer), "", objinfo->objname, b); - return NewString(buffer); - } else { - return NewString(obj); + if (objinfo->doh_str) { + return (objinfo->doh_str)(b); + } +- sprintf(buffer,"", objinfo->objname, b); ++ snprintf(buffer, sizeof(buffer), "", objinfo->objname, b); + return NewString(buffer); + } else { + return NewString(obj); Added files: Index: pkgsrc/www/swill/buildlink3.mk diff -u /dev/null pkgsrc/www/swill/buildlink3.mk:1.1 --- /dev/null Thu Aug 11 12:51:16 2016 +++ pkgsrc/www/swill/buildlink3.mk Thu Aug 11 12:51:15 2016 @@ -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 Index: pkgsrc/www/swill/patches/patch-Makefile.in diff -u /dev/null pkgsrc/www/swill/patches/patch-Makefile.in:1.1 --- /dev/null Thu Aug 11 12:51:16 2016 +++ pkgsrc/www/swill/patches/patch-Makefile.in Thu Aug 11 12:51:15 2016 @@ -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 Index: pkgsrc/www/swill/patches/patch-Source_Objects_Makefile.in diff -u /dev/null pkgsrc/www/swill/patches/patch-Source_Objects_Makefile.in:1.1 --- /dev/null Thu Aug 11 12:51:16 2016 +++ pkgsrc/www/swill/patches/patch-Source_Objects_Makefile.in Thu Aug 11 12:51:15 2016 @@ -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) + Index: pkgsrc/www/swill/patches/patch-Source_SWILL_Makefile.in diff -u /dev/null pkgsrc/www/swill/patches/patch-Source_SWILL_Makefile.in:1.1 --- /dev/null Thu Aug 11 12:51:16 2016 +++ pkgsrc/www/swill/patches/patch-Source_SWILL_Makefile.in Thu Aug 11 12:51:15 2016 @@ -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) --_----------=_1470919876245730--