On Sun, Apr 08, 2018 at 03:17:09PM +0200, Hiltjo Posthuma wrote: > This updates stagit from 0.7.2 to 0.8. > > stagit project changes: > - Fix pledge(2) abort with newer libgit/libcurl: this is because libgit uses > curl which uses some initialization checks, namely an IPv6 check which > creates a socket. The pledge(2) is now done after this initialization. > - Add -l option: limit the amount of commits for the log.html file. > - Remove a non-portable syntax in Makefile. > - Improve example script and documentation slightly. > - style.css: improve compatibility with older browsers, namely dillo. > - Minor optimization for the diffstat. > > > No special changes in the Makefile: just a version bump. Updated diff below passing CFLAGS, otherwise both CFLAGS and DEBUG are completely ignored.
patch-Makefile can be dropped in favour of passing COMPATOBJ='', I'd also drop patch-compat_h as it makes no difference. Use TLS for HOMEPAGE and HTTPS. Feedback? Index: Makefile =================================================================== RCS file: /cvs/ports/www/stagit/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile 12 Jan 2018 23:15:03 -0000 1.6 +++ Makefile 8 Apr 2018 13:56:00 -0000 @@ -2,22 +2,25 @@ COMMENT = static git page generator -DISTNAME = stagit-0.7.2 +DISTNAME = stagit-0.8 CATEGORIES = www -HOMEPAGE = http://git.2f30.org/stagit/ +HOMEPAGE = https://git.2f30.org/stagit/ # MIT/X Consortium License PERMIT_PACKAGE_CDROM = Yes # uses pledge() WANTLIB = c git2 + LIB_DEPENDS = devel/libgit2/libgit2>=0.22 -MASTER_SITES = http://dl.2f30.org/releases/ +MASTER_SITES = https://dl.2f30.org/releases/ -MAKE_FLAGS= GITINC=${LOCALBASE}/include \ +MAKE_FLAGS= CFLAGS='${CFLAGS}' \ + COMPATOBJ='' \ + GITINC=${LOCALBASE}/include \ GITLIB=${LOCALBASE}/lib NO_TEST = Yes Index: distinfo =================================================================== RCS file: /cvs/ports/www/stagit/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 12 Jan 2018 23:15:03 -0000 1.5 +++ distinfo 8 Apr 2018 13:56:00 -0000 @@ -1,2 +1,2 @@ -SHA256 (stagit-0.7.2.tar.gz) = JfrLfOOE8dLwbFNnU+J1SzgDe0gsalRhluvr9MNLetQ= -SIZE (stagit-0.7.2.tar.gz) = 16845 +SHA256 (stagit-0.8.tar.gz) = 3w0+/hopdY5BUh1Ku8cSvPv+++uDeUXylRIf9oC8KKY= +SIZE (stagit-0.8.tar.gz) = 17378 Index: patches/patch-Makefile =================================================================== RCS file: patches/patch-Makefile diff -N patches/patch-Makefile --- patches/patch-Makefile 12 Jan 2018 23:15:03 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ -$OpenBSD: patch-Makefile,v 1.3 2018/01/12 23:15:03 juanfra Exp $ -Index: Makefile ---- Makefile.orig -+++ Makefile -@@ -25,7 +25,7 @@ COMPATOBJ = \ - strlcat.o\ - strlcpy.o - --OBJ = ${SRC:.c=.o} ${COMPATOBJ} -+OBJ = ${SRC:.c=.o} - - all: ${BIN} - -@@ -49,11 +49,11 @@ dist: - - ${OBJ}: config.mk ${HDR} - --stagit: stagit.o ${COMPATOBJ} -- ${CC} -o $@ stagit.o ${COMPATOBJ} ${LDFLAGS} -+stagit: stagit.o -+ ${CC} -o $@ stagit.o ${LDFLAGS} - --stagit-index: stagit-index.o ${COMPATOBJ} -- ${CC} -o $@ stagit-index.o ${COMPATOBJ} ${LDFLAGS} -+stagit-index: stagit-index.o -+ ${CC} -o $@ stagit-index.o ${LDFLAGS} - - clean: - rm -f ${BIN} ${OBJ} ${NAME}-${VERSION}.tar.gz Index: patches/patch-compat_h =================================================================== RCS file: patches/patch-compat_h diff -N patches/patch-compat_h --- patches/patch-compat_h 26 Apr 2016 13:53:10 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-compat_h,v 1.1.1.1 2016/04/26 13:53:10 juanfra Exp $ ---- compat.h.orig Tue Apr 26 02:15:26 2016 -+++ compat.h Tue Apr 26 02:16:53 2016 -@@ -1,6 +1,8 @@ -+#if 0 - #undef strlcat - size_t strlcat(char *, const char *, size_t); - #undef strlcpy - size_t strlcpy(char *, const char *, size_t); - #undef reallocarray - void *reallocarray(void *, size_t, size_t); -+#endif Index: patches/patch-config_mk =================================================================== RCS file: /cvs/ports/www/stagit/patches/patch-config_mk,v retrieving revision 1.1 diff -u -p -r1.1 patch-config_mk --- patches/patch-config_mk 9 May 2016 17:02:52 -0000 1.1 +++ patches/patch-config_mk 8 Apr 2018 13:56:00 -0000 @@ -1,8 +1,9 @@ ---- config.mk.orig Sat May 7 15:07:28 2016 -+++ config.mk Mon May 9 13:36:03 2016 +Index: config.mk +--- config.mk.orig ++++ config.mk @@ -29,4 +29,4 @@ LDFLAGS = -s ${LIBS} CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS} # OpenBSD 5.9+: use pledge(2) --#CPPFLAGS += -DUSE_PLEDGE +-#CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE -DUSE_PLEDGE ${INCS} +CPPFLAGS += -DUSE_PLEDGE
