summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cad/boolean/Makefile17
-rw-r--r--cad/boolean/distinfo8
-rw-r--r--cad/boolean/patches/patch-ac4
-rw-r--r--cad/boolean/patches/patch-ad4
-rw-r--r--cad/boolean/patches/patch-ae4
-rw-r--r--security/prelude-lml/Makefile20
-rw-r--r--security/prelude-lml/PLIST4
7 files changed, 31 insertions, 30 deletions
diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index feaa9d60aa8..4315ed0cc52 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/04/17 13:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2006/05/21 15:57:42 rillig Exp $
#
DISTNAME= boolean_6_7
@@ -29,11 +29,12 @@ INSTALLATION_DIRS= bin
# the zip archive messes up the case of these files which breaks
# cmake.
post-patch:
+ set -e; \
for f in `${FIND} ${WRKSRC} -name cmakelists.txt -print`; do \
- d=`${DIRNAME} $$f` ; \
+ d=`${DIRNAME} "$$f"` ; \
n="$$d/CMakeLists.txt" ; \
${ECHO} "$$f -> $$n" ; \
- ${MV} $$f $$n ; done
+ ${MV} "$$f" "$$n"; done
${MV} ${WRKSRC}/bin/checkmsvc.cmake ${WRKSRC}/bin/CheckMSVC.cmake
${MV} ${WRKSRC}/bin/findpkgconfig.cmake ${WRKSRC}/bin/FindPkgConfig.cmake
${MV} ${WRKSRC}/bin/findwxwin.cmake ${WRKSRC}/bin/FindwxWin.cmake
@@ -49,11 +50,11 @@ do-configure:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/boolean
- cd ${WRKSRC}/apps/edit && \
- ${TAR} cf - default gdsuser | ${TAR} -xvf - -C ${PREFIX}/share/boolean
- cd ${WRKSRC}/docs && \
- ${TAR} cf - html | ${TAR} -xvf - -C ${PREFIX}/share/boolean
- ${CHOWN} -R ${BINOWN}.${BINGRP} ${PREFIX}/share/boolean
+ cd ${WRKSRC}/apps/edit \
+ && ${PAX} -rw default gdsuser ${PREFIX}/share/boolean
+ cd ${WRKSRC}/docs \
+ && ${PAX} -rw html ${PREFIX}/share/boolean
+ ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/boolean
${INSTALL_SCRIPT} ${WRKSRC}/bin/boolean ${PREFIX}/bin/boolean
${INSTALL_PROGRAM} ${WRKSRC}/apps/edit/edit ${PREFIX}/bin/edit
diff --git a/cad/boolean/distinfo b/cad/boolean/distinfo
index 503337ab546..a9e6e1eec32 100644
--- a/cad/boolean/distinfo
+++ b/cad/boolean/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2006/03/28 20:42:48 joerg Exp $
+$NetBSD: distinfo,v 1.8 2006/05/21 15:57:43 rillig Exp $
SHA1 (boolean-6.7/boolean_6_7.zip) = c0d5dd7963e2f02be1ebe97eeddfb6a7377feaa3
RMD160 (boolean-6.7/boolean_6_7.zip) = 5a1a926dd130312ea8255576993b92f826b2e30d
Size (boolean-6.7/boolean_6_7.zip) = 3841104 bytes
SHA1 (patch-aa) = d2287a7271b7aa0a50b1ef9d87bf5e5ba8a6db6e
SHA1 (patch-ab) = 19bf76826a67bd640451c558e8e36d830c23ebf5
-SHA1 (patch-ac) = d76d86f827b745d2cb66c295fcf77eb8e99f7ba1
-SHA1 (patch-ad) = 1720ef30fa0c284f6eb4f70be0033e5d3a3cf383
-SHA1 (patch-ae) = 05bc774fe8f4651fa596de28cf7af1fce5868549
+SHA1 (patch-ac) = a8973d02b73d13c0cf07d766324d33f5161b98aa
+SHA1 (patch-ad) = 5934a12e35d6977721c979557cf33bf069001443
+SHA1 (patch-ae) = c5b69b5f7f4732fa184d2bcf0359caeb67082693
diff --git a/cad/boolean/patches/patch-ac b/cad/boolean/patches/patch-ac
index d84ce2dac50..7148e273484 100644
--- a/cad/boolean/patches/patch-ac
+++ b/cad/boolean/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.3 2005/12/18 21:08:55 rillig Exp $
+$NetBSD: patch-ac,v 1.4 2006/05/21 15:57:43 rillig Exp $
Don't define identifiers that are already macros.
--- modules/kbool/include/booleng.h.orig Mon Jul 18 21:56:16 2005
+++ modules/kbool/include/booleng.h Sun Dec 18 20:56:07 2005
-@@ -56,8 +56,12 @@ class KBoolLink;
+@@ -56,8 +56,12 @@
typedef long long B_INT; // 8 bytes integer
//#define MAXB_INT LONG_LONG_MAX
//#define MINB_INT LONG_LONG_MIN // 8 bytes integer
diff --git a/cad/boolean/patches/patch-ad b/cad/boolean/patches/patch-ad
index 94433b664f8..167405db6f7 100644
--- a/cad/boolean/patches/patch-ad
+++ b/cad/boolean/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2006/03/28 20:42:48 joerg Exp $
+$NetBSD: patch-ad,v 1.4 2006/05/21 15:57:43 rillig Exp $
--- modules/kbool/src/scanbeam.cpp.orig 2006-03-28 17:34:33.000000000 +0000
+++ modules/kbool/src/scanbeam.cpp
-@@ -1417,3 +1417,9 @@ bool ScanBeam::writebeam()
+@@ -1417,3 +1417,9 @@
return true;
}
diff --git a/cad/boolean/patches/patch-ae b/cad/boolean/patches/patch-ae
index 2b545a0f4a7..80becc77f56 100644
--- a/cad/boolean/patches/patch-ae
+++ b/cad/boolean/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2006/03/28 20:42:48 joerg Exp $
+$NetBSD: patch-ae,v 1.4 2006/05/21 15:57:43 rillig Exp $
--- modules/kbool/include/statusb.h.orig 2006-03-28 17:33:35.000000000 +0000
+++ modules/kbool/include/statusb.h
-@@ -32,7 +32,7 @@ class StatusBar
+@@ -32,7 +32,7 @@
{
public:
// constructor & destructor
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 41ecd0b761e..a5ed2a0e043 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/05/21 15:05:57 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/05/21 15:50:18 rillig Exp $
#
DISTNAME= prelude-lml-0.9.4
@@ -12,8 +12,8 @@ COMMENT= Log analyzer monitoring your logfile and received syslog messages
.include "../../mk/bsd.prefs.mk"
-PRELUDE_USER?= _prelude
-PRELUDE_GROUP?= _prelude
+PRELUDE_USER?= _prelude
+PRELUDE_GROUP?= _prelude
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
@@ -22,7 +22,7 @@ USE_TOOLS+= gmake
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ARGS+= --disable-fam
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
RCD_SCRIPTS= preludelml
PRELUDE_USER?= _prelude
PRELUDE_GROUP?= _prelude
@@ -39,11 +39,11 @@ FILES_SUBST+= PRELUDE_LML_PID_DIR=${PRELUDE_LML_PID_DIR:Q}
FILES_SUBST+= PRELUDE_USER=${PRELUDE_USER:Q}
FILES_SUBST+= PRELUDE_GROUP=${PRELUDE_GROUP:Q}
-SUBST_CLASSES+= code
-SUBST_STAGE.code= post-patch
-SUBST_FILES.code= run-prelude-lml.c
-SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
+SUBST_CLASSES+= code
+SUBST_STAGE.code= post-patch
+SUBST_FILES.code= run-prelude-lml.c
+SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
PKG_SYSCONFSUBDIR= prelude-lml
EGDIR= share/examples/prelude-lml/
@@ -62,7 +62,7 @@ CONF_FILES_PERMS+= ${EGDIR}/prelude-lml.conf ${PKG_SYSCONFDIR}/prelude-lml.conf
selinux.rules sendmail.rules shadow-utils.rules single.rules \
squid.rules ssh.rules sudo.rules tripwire.rules vigor.rules \
vpopmail.rules webmin.rules wu-ftp.rules zywall.rules zyxel.rules
-CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+CONF_FILES+= ${EGDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q}
.endfor
pre-patch:
diff --git a/security/prelude-lml/PLIST b/security/prelude-lml/PLIST
index b8cf3fda8a3..04a93f852db 100644
--- a/security/prelude-lml/PLIST
+++ b/security/prelude-lml/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2006/05/20 19:12:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/05/21 15:50:18 rillig Exp $
bin/prelude-lml
include/prelude-lml/prelude-lml.h
lib/prelude-lml/debug.la
lib/prelude-lml/pcre.la
sbin/run-prelude-lml
-share/examples/rc.d/preludelml
share/examples/prelude-lml/plugins.rules
share/examples/prelude-lml/prelude-lml.conf
share/examples/prelude-lml/ruleset/apc-emu.rules
@@ -54,6 +53,7 @@ share/examples/prelude-lml/ruleset/webmin.rules
share/examples/prelude-lml/ruleset/wu-ftp.rules
share/examples/prelude-lml/ruleset/zywall.rules
share/examples/prelude-lml/ruleset/zyxel.rules
+share/examples/rc.d/preludelml
@dirrm share/examples/prelude-lml/ruleset
@dirrm lib/prelude-lml
@dirrm include/prelude-lml
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 02:34:48 +0000