summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/imapfilter/Makefile3
-rw-r--r--mail/imapfilter/distinfo4
-rw-r--r--mail/imapfilter/patches/patch-aa11
-rw-r--r--www/screws/Makefile4
-rw-r--r--www/screws/distinfo5
-rw-r--r--www/screws/patches/patch-ae13
-rw-r--r--www/screws/patches/patch-ag13
7 files changed, 40 insertions, 13 deletions
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index c276d186713..72429606be4 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2006/08/02 20:03:13 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2006/08/14 22:36:12 wiz Exp $
DISTNAME= imapfilter-1.2.2
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://imapfilter.hellug.gr/source/
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo
index 31a52e1d8df..e4029bc3193 100644
--- a/mail/imapfilter/distinfo
+++ b/mail/imapfilter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2006/08/02 20:03:13 rillig Exp $
+$NetBSD: distinfo,v 1.15 2006/08/14 22:36:12 wiz Exp $
SHA1 (imapfilter-1.2.2.tar.bz2) = a033cb7128cba0cd9cb514e55743f84ad7608ecd
RMD160 (imapfilter-1.2.2.tar.bz2) = 0bbe32f16ab956a8a736d9e072829d7974186cf3
Size (imapfilter-1.2.2.tar.bz2) = 32625 bytes
-SHA1 (patch-aa) = 6cf4fcd70cb115b0333659a39ffdea902a381c9f
+SHA1 (patch-aa) = 0dd1536013f6f8422125fa7fa184e7994acc73c9
diff --git a/mail/imapfilter/patches/patch-aa b/mail/imapfilter/patches/patch-aa
index 4520f1b71e4..464ff369663 100644
--- a/mail/imapfilter/patches/patch-aa
+++ b/mail/imapfilter/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2006/01/15 14:28:07 seb Exp $
+$NetBSD: patch-aa,v 1.7 2006/08/14 22:36:12 wiz Exp $
---- Makefile.orig 2005-11-10 23:21:55.000000000 +0000
+--- Makefile.orig 2006-08-01 12:11:34.000000000 +0000
+++ Makefile
-@@ -1,18 +1,11 @@
+@@ -1,20 +1,13 @@
-DESTDIR = /usr/local
-BINDIR = /usr/local/bin
-SHAREDIR = /usr/local/share/imapfilter
@@ -24,8 +24,11 @@ $NetBSD: patch-aa,v 1.6 2006/01/15 14:28:07 seb Exp $
-LDFLAGS = $(MYLDFLAGS) $(LIBDIRS)
+CFLAGS+= $(DEFS)
- LIBS = -lm -llua -llualib -lssl -lcrypto
+-LIBS = -lm -llua -llualib -lssl -lcrypto
++LIBS = -lm -llua -lssl -lcrypto
+ MAN_BIN = imapfilter.1
+ MAN_CONFIG = imapfilter_config.5
@@ -30,7 +23,7 @@ OBJ = auth.o buffer.o cert.o core.o file
all: $(BIN)
diff --git a/www/screws/Makefile b/www/screws/Makefile
index bf36947559d..94f8097039b 100644
--- a/www/screws/Makefile
+++ b/www/screws/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/06/25 09:40:01 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/08/14 22:36:47 wiz Exp $
#
DISTNAME= screws-0.56
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= ftp://ftp.nopcode.org/prj/screws/
diff --git a/www/screws/distinfo b/www/screws/distinfo
index 18b301926d0..c8cbb62f12f 100644
--- a/www/screws/distinfo
+++ b/www/screws/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2006/01/10 18:28:06 joerg Exp $
+$NetBSD: distinfo,v 1.11 2006/08/14 22:36:47 wiz Exp $
SHA1 (screws-0.56.tar.gz) = 3335e7e7116561499ee7164831c31df4ecebe403
RMD160 (screws-0.56.tar.gz) = 5d7f1af67a42cd5726f0d4708713bb13c4c8fe21
@@ -7,5 +7,6 @@ SHA1 (patch-aa) = 0101b7083bb45358371a3853783f9c65cc5b2435
SHA1 (patch-ab) = d5f8997c9e1ed2795591e4d29605e9208351bf81
SHA1 (patch-ac) = 7d0542f65b24ba9d7ed035c140d7165a19b2f73d
SHA1 (patch-ad) = 984fa51aff7d17ba69f3ea1c0b9cf4bbb70e3973
-SHA1 (patch-ae) = 962fee7b800118d4b3407d0482cfb73967f011ea
+SHA1 (patch-ae) = 081cb01537481d48cbc37a96ea72e242db76e7ae
SHA1 (patch-af) = 9ac19813079a67c8f01ea5d2b3a85c309db00f95
+SHA1 (patch-ag) = cd3b907cd839f51fd0180e1f0bb40102f01c41f2
diff --git a/www/screws/patches/patch-ae b/www/screws/patches/patch-ae
index 63231d8a33b..e10383a27b3 100644
--- a/www/screws/patches/patch-ae
+++ b/www/screws/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2005/03/20 17:52:20 jmmv Exp $
+$NetBSD: patch-ae,v 1.3 2006/08/14 22:36:47 wiz Exp $
---- src/Hsml/Makefile.orig 2004-11-08 23:41:48.000000000 +0100
+--- src/Hsml/Makefile.orig 2004-11-08 22:41:48.000000000 +0000
+++ src/Hsml/Makefile
@@ -7,7 +7,7 @@ DEBUG=-g
DEFS+= -DINCORE_LUA=${INCORE_LUA}
@@ -20,3 +20,12 @@ $NetBSD: patch-ae,v 1.2 2005/03/20 17:52:20 jmmv Exp $
@echo "-----------------"
clean:
+@@ -24,7 +24,7 @@ clean:
+
+ opts:
+ echo > .opts
+- if [ "${INCORE_LUA}" = "1" ]; then echo "-llualib -L /usr/pkg/lib -R /usr/pkg/lib -llua -lm " > .opts ; \
++ if [ "${INCORE_LUA}" = "1" ]; then echo "-L /usr/pkg/lib -R /usr/pkg/lib -llua -lm " > .opts ; \
+ else echo "" > .opts ; fi
+ if [ "`uname`" = "Linux" ]; then echo " -ldl " >> .opts ; fi
+
diff --git a/www/screws/patches/patch-ag b/www/screws/patches/patch-ag
new file mode 100644
index 00000000000..5450a98e196
--- /dev/null
+++ b/www/screws/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2006/08/14 22:36:47 wiz Exp $
+
+--- src/Modules/Makefile.orig 2004-09-16 22:05:58.000000000 +0000
++++ src/Modules/Makefile
+@@ -22,7 +22,7 @@ hsmlexec:
+ @if [ "${INCORE_LUA}" = "1" ]; then \
+ echo "[modules] HsmlExec.so << injecting lua into the core." ;\
+ ${CC} ${CFLAGS} -DINCORE_LUA=1 -fPIC -c HsmlExec.c ;\
+- ${CC} ${LDFLAGS} -lm -llua -llualib ${HSMLEXEC_OBJS} -shared -o ${HSMLEXEC_MOD} ;\
++ ${CC} ${LDFLAGS} -lm -llua ${HSMLEXEC_OBJS} -shared -o ${HSMLEXEC_MOD} ;\
+ else \
+ $(CC) ${CFLAGS} -c HsmlExec.c ;\
+ $(CC) ${LDFLAGS} ${HSMLEXEC_OBJS} -shared -o ${HSMLEXEC_MOD} ;\