Second try. Ok?
- fix headers installation during fake stage when exactly the same
header file is already installed in the system, this is for various
ports from conformal.com, no bump needed, build only issue
- fix crash at the end of cyphertite session, from upstream cvs
- bump revision for cyphertite
Index: archivers/libshrink/patches/patch-libshrink_Makefile
===================================================================
RCS file: archivers/libshrink/patches/patch-libshrink_Makefile
diff -N archivers/libshrink/patches/patch-libshrink_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ archivers/libshrink/patches/patch-libshrink_Makefile 25 Jun 2011
23:55:13 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libshrink/Makefile.orig Sun May 1 19:50:03 2011
++++ libshrink/Makefile Sun Jun 26 00:23:04 2011
+@@ -23,7 +23,7 @@ LDADD+= -L${LOCALBASE}/lib
+
+ afterinstall:
+ @cd ${.CURDIR}; for i in ${HDRS}; do \
+- cmp -s $$i ${INCDIR}/$$i || \
++ cmp -s $$i ${DESTDIR}${INCDIR}/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${INCDIR}/; \
+ echo ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${INCDIR}/; \
+ done
Index: devel/libclog/patches/patch-Makefile
===================================================================
RCS file: devel/libclog/patches/patch-Makefile
diff -N devel/libclog/patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/libclog/patches/patch-Makefile 25 Jun 2011 23:55:39 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.orig Tue Jun 14 19:27:35 2011
++++ Makefile Sun Jun 26 00:26:23 2011
+@@ -44,7 +44,7 @@ CFLAGS+= -ggdb3 -I${.CURDIR} -I${INCDIR}
+
+ afterinstall:
+ @cd ${.CURDIR}; for i in ${HDRS}; do \
+- cmp -s $$i ${LOCALBASE}/include/$$i || \
++ cmp -s $$i ${DESTDIR}${LOCALBASE}/include/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${LOCALBASE}/include; \
+ echo ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${LOCALBASE}/include;\
+ done
Index: devel/libexude/patches/patch-Makefile
===================================================================
RCS file: devel/libexude/patches/patch-Makefile
diff -N devel/libexude/patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/libexude/patches/patch-Makefile 25 Jun 2011 23:55:40 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.orig Mon Apr 11 19:02:56 2011
++++ Makefile Sun Jun 26 00:28:19 2011
+@@ -36,7 +36,7 @@ HDRS= exude.h
+
+ afterinstall:
+ @cd ${.CURDIR}; for i in ${HDRS}; do \
+- cmp -s $$i ${LOCALBASE}/include/$$i || \
++ cmp -s $$i ${DESTDIR}${LOCALBASE}/include/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${LOCALBASE}/include; \
+ echo ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${LOCALBASE}/include;\
+ done
Index: security/assl/patches/patch-Makefile
===================================================================
RCS file: security/assl/patches/patch-Makefile
diff -N security/assl/patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/assl/patches/patch-Makefile 25 Jun 2011 23:56:55 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.orig Thu May 5 03:46:52 2011
++++ Makefile Sun Jun 26 00:29:52 2011
+@@ -44,7 +44,7 @@ CLEANFILES+= assl.cat3
+
+ afterinstall:
+ @cd ${.CURDIR}; for i in ${HDRS}; do \
+- cmp -s $$i ${LOCALBASE}/include/$$i || \
++ cmp -s $$i ${DESTDIR}${LOCALBASE}/include/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${LOCALBASE}/include; \
+ echo ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${LOCALBASE}/include; \
+ done
Index: sysutils/cyphertite/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/cyphertite/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sysutils/cyphertite/Makefile 23 Jun 2011 22:50:29 -0000 1.3
+++ sysutils/cyphertite/Makefile 25 Jun 2011 23:57:01 -0000
@@ -3,6 +3,7 @@
COMMENT = tar-like secure remote deduplicating archiver
DISTNAME = cyphertite-0.1.3
+REVISION = 0
CATEGORIES = sysutils archivers security
HOMEPAGE = https://www.cyphertite.com/
Index: sysutils/cyphertite/patches/patch-ctutil_Makefile
===================================================================
RCS file: sysutils/cyphertite/patches/patch-ctutil_Makefile
diff -N sysutils/cyphertite/patches/patch-ctutil_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/cyphertite/patches/patch-ctutil_Makefile 25 Jun 2011 23:57:01
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- ctutil/Makefile.orig Thu May 19 19:55:01 2011
++++ ctutil/Makefile Sun Jun 26 00:42:25 2011
+@@ -21,7 +21,7 @@ CFLAGS+= -ggdb3
+
+ afterinstall:
+ @cd ${.CURDIR}; for i in ${HDRS}; do \
+- cmp -s $$i ${INCDIR}/$$i || \
++ cmp -s $$i ${DESTDIR}${INCDIR}/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${INCDIR}/; \
+ echo ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${INCDIR}/; \
+ done
Index: sysutils/cyphertite/patches/patch-cyphertite_ct_db_c
===================================================================
RCS file: sysutils/cyphertite/patches/patch-cyphertite_ct_db_c
diff -N sysutils/cyphertite/patches/patch-cyphertite_ct_db_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysutils/cyphertite/patches/patch-cyphertite_ct_db_c 25 Jun 2011
23:57:01 -0000
@@ -0,0 +1,28 @@
+
+fix crashes at the end of cyphertite session,
+from upstream cvs diff -u -r1.2 -r1.3
+
+$OpenBSD$
+--- cyphertite/ct_db.c.orig Wed Jun 1 16:06:50 2011
++++ cyphertite/ct_db.c Sat Jun 25 10:09:33 2011
+@@ -244,12 +244,16 @@ ctdb_cleanup(sqlite3 *db)
+ if (sqlite3_exec(db, "commit", NULL, 0, &errmsg))
+ CFATALX("can't commit %s", errmsg);
+ }
+- if (ctdb_stmt_lookup != NULL)
++ if (ctdb_stmt_lookup != NULL) {
+ if (sqlite3_finalize(ctdb_stmt_lookup))
+- CFATALX("can't finalize lookup");
+- if (ctdb_stmt_insert != NULL)
++ CFATALX("can't finalize lookup");
++ ctdb_stmt_lookup = NULL;
++ }
++ if (ctdb_stmt_insert != NULL) {
+ if (sqlite3_finalize(ctdb_stmt_insert))
+- CFATALX("can't finalize insert");
++ CFATALX("can't finalize insert");
++ ctdb_stmt_insert = NULL;
++ }
+
+ sqlite3_close(db);
+ }
Index: textproc/libxmlsd/patches/patch-Makefile
===================================================================
RCS file: textproc/libxmlsd/patches/patch-Makefile
diff -N textproc/libxmlsd/patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ textproc/libxmlsd/patches/patch-Makefile 25 Jun 2011 23:57:10 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.orig Sun May 1 00:02:51 2011
++++ Makefile Sun Jun 26 00:43:51 2011
+@@ -23,7 +23,7 @@ LDADD+=-lexpat
+
+ afterinstall:
+ @cd ${.CURDIR}; for i in ${HDRS}; do \
+- cmp -s $$i ${LOCALBASE}/include/$$i || \
++ cmp -s $$i ${DESTDIR}${LOCALBASE}/include/$$i || \
+ ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${LOCALBASE}/include; \
+ echo ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i
${DESTDIR}${LOCALBASE}/include; \
+ done
--
best regards
q#
