diff options
author | jmmv <jmmv> | 2003-07-30 15:41:51 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2003-07-30 15:41:51 +0000 |
commit | 919dcfaf9fa6788323462f33d5583fb7470e8fcc (patch) | |
tree | 6932001e26c0e8264109d36db13bc7d606dd56fa /net | |
parent | 72d80085e76167116588d639ec92fc0ec152c4ed (diff) | |
download | pkgsrc-919dcfaf9fa6788323462f33d5583fb7470e8fcc.tar.gz |
Convert to use the bsd.pkg.install.mk framework:
- Install sample file in the examples directory.
- Honour PKG_SYSCONFDIR properly.
- Use RCD_SCRIPTS to handle the rc.d script.
As a result, bump PKGREVISION to 2.
Diffstat (limited to 'net')
-rw-r--r-- | net/iplog/Makefile | 22 | ||||
-rw-r--r-- | net/iplog/PLIST | 7 | ||||
-rw-r--r-- | net/iplog/distinfo | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | net/iplog/files/iplog.sh (renamed from net/iplog/files/iplog) | 7 | ||||
-rw-r--r-- | net/iplog/patches/patch-aa | 4 |
5 files changed, 22 insertions, 22 deletions
diff --git a/net/iplog/Makefile b/net/iplog/Makefile index 819556f38f1..9f0d9af59e8 100644 --- a/net/iplog/Makefile +++ b/net/iplog/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:05 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2003/07/30 15:41:51 jmmv Exp $ # DISTNAME= iplog-2.2.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ojnk/} @@ -11,16 +11,21 @@ HOMEPAGE= http://ojnl.sourceforge.net COMMENT= Iplog is a tool using pcap to log ip traffic USE_BUILDLINK2= YES +USE_GMAKE= YES +USE_PKGINSTALL= YES GNU_CONFIGURE= YES CFLAGSTMP="-I${PREFIX}/include -Wall" LDFLAGSTMP="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib" LIBSTMP="-lpthread" -USE_GMAKE= YES +RCD_SCRIPTS= iplog + +EGDIR= ${PREFIX}/share/examples/iplog post-patch: - cd ${WRKSRC}/src && ${SED} s,%PREFIX%/etc,${PKG_SYSCONFBASE},g < iplog.h > iplog.h.patched && ${MV} iplog.h.patched iplog.h + cd ${WRKSRC}/src && ${SED} s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g \ + < iplog.h > iplog.h.patched && ${MV} iplog.h.patched iplog.h do-configure: cd ${WRKSRC} && CFLAGS=${CFLAGSTMP} \ @@ -32,14 +37,9 @@ do-configure: do-build: cd ${WRKSRC} && ${GMAKE} all -post-build: - ${SED} \ - -e 's|%PREFIX%|${PREFIX}|' \ - <${FILESDIR}/iplog >${WRKDIR}/iplog - post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/iplog ${PREFIX}/etc/rc.d/iplog - ${INSTALL_DATA} ${WRKSRC}/example-iplog.conf ${PREFIX}/etc/iplog.conf.sample + ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/example-iplog.conf ${EGDIR}/iplog.conf .include "../../mk/pthread.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/iplog/PLIST b/net/iplog/PLIST index 6e7bf06afaf..fba051a5b9b 100644 --- a/net/iplog/PLIST +++ b/net/iplog/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/06 11:06:04 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/07/30 15:41:51 jmmv Exp $ +etc/rc.d/iplog man/man5/iplog.conf.5 man/man8/iplog.8 sbin/iplog -etc/rc.d/iplog -etc/iplog.conf.sample +share/examples/iplog/iplog.conf +@dirrm share/examples/iplog diff --git a/net/iplog/distinfo b/net/iplog/distinfo index 97392a4f43d..c7b013e68b1 100644 --- a/net/iplog/distinfo +++ b/net/iplog/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/04/06 11:06:04 hubertf Exp $ +$NetBSD: distinfo,v 1.2 2003/07/30 15:41:51 jmmv Exp $ SHA1 (iplog-2.2.3.tar.gz) = ce257d13ceb54bacb5cfe97570603868c7463cb2 Size (iplog-2.2.3.tar.gz) = 133639 bytes -SHA1 (patch-aa) = 0b8d6e27d40315ee1ee5e07d582c94652a918b9e +SHA1 (patch-aa) = 11c5892a83d9f764246994098663732b30784d6a diff --git a/net/iplog/files/iplog b/net/iplog/files/iplog.sh index 5f081e3b48a..4ef00efe73d 100755..100644 --- a/net/iplog/files/iplog +++ b/net/iplog/files/iplog.sh @@ -1,6 +1,6 @@ -#!/bin/sh +#!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: iplog,v 1.1.1.1 2003/04/06 11:06:04 hubertf Exp $ +# $NetBSD: iplog.sh,v 1.1 2003/07/30 15:41:54 jmmv Exp $ # # PROVIDE: iplog # REQUIRE: SERVERS @@ -9,9 +9,8 @@ name="iplog" rcvar=${name} -command="%PREFIX%/sbin/${name}" +command="@PREFIX@/sbin/${name}" pidfile="/var/run/${name}.pid" load_rc_config ${name} - run_rc_command "$1" diff --git a/net/iplog/patches/patch-aa b/net/iplog/patches/patch-aa index 181430c09ba..fa8b2d97c94 100644 --- a/net/iplog/patches/patch-aa +++ b/net/iplog/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/04/06 11:06:04 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2003/07/30 15:41:55 jmmv Exp $ --- src/iplog.h.orig Mon Jan 1 17:02:14 2001 +++ src/iplog.h @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/04/06 11:06:04 hubertf Exp $ */ -#define CONFFILE "/etc/iplog.conf" -+#define CONFFILE "%PREFIX%/etc/iplog.conf" ++#define CONFFILE "@PKG_SYSCONFDIR@/iplog.conf" /* ** Making these smaller will probably do bad things. |