summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-07-30 18:09:25 +0000
committerjmmv <jmmv@pkgsrc.org>2003-07-30 18:09:25 +0000
commite7fdf9b4cf586ce72f3c4088b7d6d0277570eb67 (patch)
tree2c73c5bc243b1e187989577dbce149216e87fb43 /net
parent65735f92827b1653d765a8dac17ad38c9b6cde85 (diff)
downloadpkgsrc-e7fdf9b4cf586ce72f3c4088b7d6d0277570eb67.tar.gz
Convert to the bsd.pkg.install.mk framework:
- Honour PKG_SYSCONFDIR. - Automatically install configuration file from sample directory. - Use RCD_SCRIPTS to automatically handle the rc.d script. - MESSAGE is not needed because of the above two points (standard messages are used). While here, avoid overriding CFLAGS while building and use the right C++ compiler (from CXX's value). Bump PKGREVISION to 1.
Diffstat (limited to 'net')
-rw-r--r--net/pxe/MESSAGE12
-rw-r--r--net/pxe/Makefile19
-rw-r--r--net/pxe/distinfo4
-rw-r--r--net/pxe/files/pxe15
-rw-r--r--net/pxe/files/pxe.sh16
-rw-r--r--net/pxe/patches/patch-aa11
6 files changed, 36 insertions, 41 deletions
diff --git a/net/pxe/MESSAGE b/net/pxe/MESSAGE
deleted file mode 100644
index f7f700ef10e..00000000000
--- a/net/pxe/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:26 wiz Exp $
-
- The pxe daemon has now been installed on your system. Before starting
- the daemon, please copy ${PREFIX}/share/examples/pxe/pxe.conf to /etc
- and modify according to your needs.
-
- Under NetBSD-1.5 or above, you can enable pxe on system startup by
- copying ${PREFIX}/etc/rc.d/pxe to /etc/rc.d and setting pxe=YES
- in your /etc/rc.conf (alternatively, you can simply start
- ${PREFIX}/sbin/pxe in your /etc/rc.local script).
-===========================================================================
diff --git a/net/pxe/Makefile b/net/pxe/Makefile
index 6fdf5946aca..a11004a29e2 100644
--- a/net/pxe/Makefile
+++ b/net/pxe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:51:42 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/30 18:09:26 jmmv Exp $
#
DISTNAME= pxe-1.2
+PKGREVISION= 1
CATEGORIES= net sysutils
MASTER_SITES= http://www.kano.org.uk/projects/pxe/
@@ -10,16 +11,20 @@ HOMEPAGE= http://www.kano.org.uk/projects/pxe/
COMMENT= Preboot eXecution Environment (PXE) daemon
GNU_CONFIGURE= YES
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
+
CONFIGURE_ARGS+=--with-log=/var/log/pxe.log
+CONFIGURE_ARGS+=--with-config="${PKG_SYSCONFDIR}/pxe.conf"
+
+EGDIR= ${PREFIX}/share/examples/pxe
+CONF_FILES= ${EGDIR}/pxe.conf ${PKG_SYSCONFDIR}/pxe.conf
-post-configure:
- ${SED} -e 's|@@PREFIX@@|${PREFIX}|g' < ${FILESDIR}/pxe > ${WRKDIR}/pxe
+RCD_SCRIPTS= pxe
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pxe ${PREFIX}/sbin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pxe
- ${INSTALL_DATA} ${WRKSRC}/pxe.conf ${PREFIX}/share/examples/pxe
- ${INSTALL_SCRIPT_DIR} ${PREFIX}/etc/rc.d
- ${INSTALL_SCRIPT} ${WRKDIR}/pxe ${PREFIX}/etc/rc.d
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/pxe.conf ${EGDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/net/pxe/distinfo b/net/pxe/distinfo
index c87c89bc934..ab0f7abc6f4 100644
--- a/net/pxe/distinfo
+++ b/net/pxe/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/03/07 07:55:22 jmc Exp $
+$NetBSD: distinfo,v 1.3 2003/07/30 18:09:26 jmmv Exp $
SHA1 (pxe-1.2.tar.gz) = d298f5892e7a1cf36af5b6c82eba28d4a724f11c
Size (pxe-1.2.tar.gz) = 44235 bytes
-SHA1 (patch-aa) = e7f36f61cbccda8fc8efedc706c7ecc8ed4a9e17
+SHA1 (patch-aa) = 4c641d4e70dacf1d716b7ce120e06b4f9ce6ef13
diff --git a/net/pxe/files/pxe b/net/pxe/files/pxe
deleted file mode 100644
index 7c4f822c64a..00000000000
--- a/net/pxe/files/pxe
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: pxe,v 1.3 2002/09/23 15:11:41 grant Exp $
-#
-# PROVIDE: pxe
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="pxe"
-command="@@PREFIX@@/sbin/${name}"
-required_files="/etc/${name}.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/pxe/files/pxe.sh b/net/pxe/files/pxe.sh
new file mode 100644
index 00000000000..6fd023a8f91
--- /dev/null
+++ b/net/pxe/files/pxe.sh
@@ -0,0 +1,16 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: pxe.sh,v 1.1 2003/07/30 18:09:27 jmmv Exp $
+#
+# PROVIDE: pxe
+# REQUIRE: DAEMON
+#
+
+. /etc/rc.subr
+
+name="pxe"
+command="@PREFIX@/sbin/${name}"
+required_files="@PKG_SYSCONFDIR@/${name}.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/pxe/patches/patch-aa b/net/pxe/patches/patch-aa
index c182cd30b62..69106fed039 100644
--- a/net/pxe/patches/patch-aa
+++ b/net/pxe/patches/patch-aa
@@ -1,11 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2002/03/07 07:55:23 jmc Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/30 18:09:28 jmmv Exp $
---- Makefile.in.orig Thu Mar 7 07:53:38 2002
-+++ Makefile.in Thu Mar 7 07:53:46 2002
+--- Makefile.in.orig 2000-10-26 16:02:12.000000000 +0200
++++ Makefile.in
@@ -1,5 +1,5 @@
- CC = g++
+-CC = g++
-CFLAGS = -g -ggdb -Wall
-+CFLAGS = -Wall
++CC = ${CXX}
++CFLAGS += -Wall
LDFLAGS = @LDFLAGS@ @LIBS@
EXECS = pxe