pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ngircd: adjust Makefile & rc file per leot's suggestions
Module Name: pkgsrc-wip
Committed By: sxvghd <sxvghd%firemail.cc@localhost>
Pushed By: sxvghd
Date: Thu Jan 2 19:24:28 2020 +0100
Changeset: e8a9b559a61617a00ef6f95fc70577dc00834213
Modified Files:
ngircd/Makefile
ngircd/PLIST
ngircd/files/ngircd.sh
Log Message:
ngircd: adjust Makefile & rc file per leot's suggestions
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e8a9b559a61617a00ef6f95fc70577dc00834213
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ngircd/Makefile | 14 ++++++--------
ngircd/PLIST | 2 +-
ngircd/files/ngircd.sh | 11 ++++++++++-
3 files changed, 17 insertions(+), 10 deletions(-)
diffs:
diff --git a/ngircd/Makefile b/ngircd/Makefile
index a45467d1bc..45eede3a35 100644
--- a/ngircd/Makefile
+++ b/ngircd/Makefile
@@ -10,22 +10,20 @@ COMMENT= Free, portable and lightweight IRC server
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
-USE_LANGUAGES= c
RCD_SCRIPTS+= ngircd
-EGDIR= ${PREFIX}/share/doc/ngircd
-CONF_FILES+= ${EGDIR}/sample-ngircd.conf ${PREFIX}/share/examples/ngircd/sample-ngircd.conf
-CONF_FILES+= ${EGDIR}/sample-ngircd.conf ${PKG_SYSCONFDIR}/ngircd.conf
+CONF_FILES+= ${PREFIX}/share/examples/ngircd/sample-ngircd.conf ${PKG_SYSCONFDIR}/ngircd.conf
-INSTALLATION_DIRS+= ${PREFIX}/share/examples/ngircd
+INSTALLATION_DIRS+= share/examples/ngircd
.include "options.mk"
post-install:
- ${RM} ${DESTDIR}${EGDIR}/COPYING
- ${RM} ${DESTDIR}${EGDIR}/HowToRelease.txt
- ${RM} ${DESTDIR}${EGDIR}/INSTALL
+ ${MV} ${DESTDIR}${PREFIX}/share/doc/ngircd/sample-ngircd.conf ${DESTDIR}${PREFIX}/share/examples/ngircd/
+ ${RM} ${DESTDIR}${PREFIX}/share/doc/ngircd/COPYING
+ ${RM} ${DESTDIR}${PREFIX}/share/doc/ngircd/HowToRelease.txt
+ ${RM} ${DESTDIR}${PREFIX}/share/doc/ngircd/INSTALL
${RM} ${DESTDIR}${PREFIX}/etc/ngircd.conf
.include "../../mk/bsd.pkg.mk"
diff --git a/ngircd/PLIST b/ngircd/PLIST
index ce89d63e22..32078ed037 100644
--- a/ngircd/PLIST
+++ b/ngircd/PLIST
@@ -21,4 +21,4 @@ share/doc/ngircd/README-Interix.txt
share/doc/ngircd/RFC.txt
share/doc/ngircd/SSL.txt
share/doc/ngircd/Services.txt
-share/doc/ngircd/sample-ngircd.conf
+share/examples/ngircd/sample-ngircd.conf
diff --git a/ngircd/files/ngircd.sh b/ngircd/files/ngircd.sh
index 59038075b5..822d20279e 100644
--- a/ngircd/files/ngircd.sh
+++ b/ngircd/files/ngircd.sh
@@ -1,4 +1,13 @@
-. /etc/rc.subr
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD $
+#
+# PROVIDE: ngircd
+# REQUIRE: DAEMON
+
+if [ -f /etc/rc.subr ]; then
+ . /etc/rc.subr
+fi
name="ngircd"
rcvar=$name
Home |
Main Index |
Thread Index |
Old Index