Date: Sat, 25 Aug 2001 15:16:15 -0500 From: "David W. Chapman Jr." <dwcjr@inethouston.net> To: current@freebsd.org, audit@freebsd.org Cc: obrien@freebsd.org Subject: ports diskcheckd patch Message-ID: <20010825151615.K53260@leviathan.inethouston.net>
next in thread | raw e-mail | index | archive | help
--TRYliJ5NKNqkz5bu
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
After the repo copy of the diskcheckd.conf gets done this patch
should be the last one I need to make ports/sysutils/diskcheckd to
work properly. Any comments/problems would be appreciated. I would
especially appreciate some patches to pkg-descr for a more detailed
description if possible.
Thanks.
--
David W. Chapman Jr.
dwcjr@inethouston.net Raintree Network Services, Inc. <www.inethouston.net>
dwcjr@freebsd.org FreeBSD Committer <www.FreeBSD.org>
--TRYliJ5NKNqkz5bu
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="diskcheckd.patch"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/diskcheckd/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 2001/08/24 14:33:09 1.1
+++ Makefile 2001/08/25 20:13:23
@@ -20,12 +20,21 @@
NO_WRKSUBDIR= yes
+CFLAGS+= -D_PATH_CONF='\"${PREFIX}/etc\"'
+
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BROKEN= "Only runs on 5.0 or higher (-current)"
+.endif
+
do-extract:
@${MKDIR} ${WRKSRC}
@(cd ${FILESDIR} && pax -r -w * ${WRKSRC})
-do-build:
- cd ${WRKSRC} && ${CC} ${CFLAGS} -DCONFPATH=\"${PREFIX}/etc\" -o diskcheckd diskcheckd.c
+do-patch:
+ @${PERL} -pi.fbsd -e 's|/usr/sbin|${PREFIX}/sbin|g' ${WRKSRC}/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${PREFIX}/sbin
@@ -33,4 +42,4 @@
${INSTALL_SCRIPT} ${WRKSRC}/diskcheckd.sh ${PREFIX}/etc/rc.d
${INSTALL_MAN} ${WRKSRC}/diskcheckd.8 ${PREFIX}/man/man8
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: files/diskcheckd.c
===================================================================
RCS file: /home/ncvs/ports/sysutils/diskcheckd/files/diskcheckd.c,v
retrieving revision 1.4
diff -u -r1.4 diskcheckd.c
--- files/diskcheckd.c 2001/08/20 15:09:33 1.4
+++ files/diskcheckd.c 2001/08/25 20:13:23
@@ -47,7 +47,10 @@
#define DKTYPENAMES
#include <sys/disklabel.h>
-#define _PATH_CONF "/etc/diskcheckd.conf"
+#ifndef _PATH_CONF
+#define _PATH_CONF "/usr/local/etc/diskcheckd.conf"
+#endif
+
#define _PATH_SAVE _PATH_VARDB"diskcheckd.offsets"
#define READ_SIZE (64 << 10)
--TRYliJ5NKNqkz5bu--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010825151615.K53260>