Update stagit to 0.8

From Hiltjo Posthuma, with input from sthen and tweaks from me.

OK juanfra, sthen
This commit is contained in:
kn 2018-04-10 23:27:51 +00:00
parent eec6eb20d5
commit bf05003093
5 changed files with 15 additions and 51 deletions

View File

@ -1,23 +1,27 @@
# $OpenBSD: Makefile,v 1.6 2018/01/12 23:15:03 juanfra Exp $
# $OpenBSD: Makefile,v 1.7 2018/04/10 23:27:51 kn Exp $
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= CC='${CC}' \
CFLAGS='${CFLAGS}' \
COMPATOBJ='' \
GITINC=${LOCALBASE}/include \
GITLIB=${LOCALBASE}/lib
NO_TEST = Yes

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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