summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorsalo <salo>2003-04-13 01:29:42 +0000
committersalo <salo>2003-04-13 01:29:42 +0000
commite03dd3e3398f537ff3e17d43fd5c926c8e6cea9d (patch)
treee431dbbd53041000db0b8f410d30c682b5301db3 /textproc
parentd617c7afe88cf48200c1ecdb7530b7364026fc91 (diff)
downloadpkgsrc-e03dd3e3398f537ff3e17d43fd5c926c8e6cea9d.tar.gz
Bump PKGREVISON:
- honour PKG_SYSCONFIDR - correctly use RCD_SCRIPTS instead of homegrown mechanism - use LIBTOOL_OVERRIDE - delint
Diffstat (limited to 'textproc')
-rw-r--r--textproc/ndtpd/MESSAGE8
-rw-r--r--textproc/ndtpd/Makefile41
-rw-r--r--textproc/ndtpd/PLIST7
-rw-r--r--textproc/ndtpd/distinfo3
-rw-r--r--textproc/ndtpd/patches/patch-ac22
5 files changed, 56 insertions, 25 deletions
diff --git a/textproc/ndtpd/MESSAGE b/textproc/ndtpd/MESSAGE
index 0113e52f03a..4014b7e782c 100644
--- a/textproc/ndtpd/MESSAGE
+++ b/textproc/ndtpd/MESSAGE
@@ -1,10 +1,10 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:39 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2003/04/13 01:29:42 salo Exp $
- You need to add a port entry to run NDTP. The default port is 2010 and
- the entry in /etc/services will look like
+You need to add a port entry to run NDTP. The default port is 2010 and
+the entry in /etc/services will look like
ndtp 2010/tcp
- Please read (well written) Info manuals for more details.
+Please read (well written) Info manuals for more details.
===========================================================================
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile
index b8ec135d38b..97d32d16e58 100644
--- a/textproc/ndtpd/Makefile
+++ b/textproc/ndtpd/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/02/06 04:24:13 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2003/04/13 01:29:42 salo Exp $
+#
DISTNAME= ndtpd-3.1.4
+PKGREVISION= 1
CATEGORIES= textproc japanese
MASTER_SITES= ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/
@@ -8,33 +10,38 @@ MAINTAINER= uebayasi@netbsd.org
HOMEPAGE= http://www.sra.co.jp/people/m-kasahr/ndtpd/
COMMENT= Server for accessing CD-ROM books with NDTP
-USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--localstatedir=${NDTPD_RUNDIR}
-CONFIGURE_ARGS+=--with-logdir=${NDTPD_LOGDIR}
-CONFIGURE_ARGS+=--with-eb
-CONFIGURE_ARGS+=--with-zlib
-MAKE_FLAGS+= INSTALL_INFO=${INSTALL_INFO}
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
+USE_LIBTOOL= YES
+GNU_CONFIGURE= YES
+
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --localstatedir=${NDTPD_RUNDIR}
+CONFIGURE_ARGS+= --with-logdir=${NDTPD_LOGDIR}
+CONFIGURE_ARGS+= --with-eb
+CONFIGURE_ARGS+= --with-zlib
+
# For INSTALL/DEINSTALL scripts.
-CONF_FILES= ${NDTPD_CONFDIR}/ndtpd.conf.sample ${NDTPD_CONFDIR}/ndtpd.conf
-RCD_SCRIPT= ndtpd.sh
+CONF_FILES= ${EGDIR}/ndtpd.conf.default ${PKG_SYSCONFDIR}/ndtpd.conf
+RCD_SCRIPTS= ndtpd
+
# Will be also used for ndtpd.sh.
FILES_SUBST+= NDTPD_RUNDIR=${NDTPD_RUNDIR}
-NDTPD_CONFDIR= ${PREFIX}/etc
+EGDIR= ${PREFIX}/share/examples/ndtpd
NDTPD_LOGDIR= ${DESTDIR}/var/log
NDTPD_RUNDIR= ${DESTDIR}/var/run
# XXX NDTPD actually uses ${NDTPD_RUNDIR}/ndtpd.
-post-build:
- @${SED} ${FILES_SUBST_SED} ${FILESDIR}/ndtpd.sh >${WRKDIR}/ndtpd.sh
-
post-install:
- @${INSTALL_SCRIPT} ${WRKDIR}/ndtpd.sh ${PREFIX}/etc/rc.d/ndtpd.sh
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/ndtpd.conf.sample \
+ ${EGDIR}/ndtpd.conf.default
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../textproc/eb/buildlink2.mk"
+
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ndtpd/PLIST b/textproc/ndtpd/PLIST
index 03bc5bb0e32..57164e748b4 100644
--- a/textproc/ndtpd/PLIST
+++ b/textproc/ndtpd/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/15 07:19:58 uebayasi Exp $
-etc/ndtpd.conf.sample
-etc/rc.d/ndtpd.sh
+@comment $NetBSD: PLIST,v 1.2 2003/04/13 01:29:42 salo Exp $
+etc/rc.d/ndtpd
@unexec install-info --delete %D/info/ndtpd-ja.info %D/info/dir
@unexec install-info --delete %D/info/ndtpd.info %D/info/dir
info/ndtpd-ja.info
@@ -12,8 +11,10 @@ info/ndtpd.info-2
@exec install-info %D/info/ndtpd-ja.info %D/info/dir
@exec install-info %D/info/ndtpd.info %D/info/dir
libexec/ndtpstat
+share/examples/ndtpd/ndtpd.conf.default
sbin/ndtpd
sbin/ndtpcheck
sbin/ndtpcontrol
sbin/ndtpdaily
sbin/ndtpupgrade
+@dirrm share/examples/ndtpd
diff --git a/textproc/ndtpd/distinfo b/textproc/ndtpd/distinfo
index dfc2c843a40..e049d8ce6fa 100644
--- a/textproc/ndtpd/distinfo
+++ b/textproc/ndtpd/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2003/02/09 15:41:01 yyamano Exp $
+$NetBSD: distinfo,v 1.3 2003/04/13 01:29:42 salo Exp $
SHA1 (ndtpd-3.1.4.tar.gz) = 54b8c3499c47a7afed8efa1190e1a67ecfc7dcd6
Size (ndtpd-3.1.4.tar.gz) = 547541 bytes
SHA1 (patch-aa) = a271f7debee44169e186e064538ea07451aa33eb
SHA1 (patch-ab) = 15334fa0332c5dc038b51451a2f99c822aac9199
+SHA1 (patch-ac) = 9ae0932c7587965f6835cbf5d48836d98e2402d9
diff --git a/textproc/ndtpd/patches/patch-ac b/textproc/ndtpd/patches/patch-ac
new file mode 100644
index 00000000000..2706163d496
--- /dev/null
+++ b/textproc/ndtpd/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2003/04/13 01:29:43 salo Exp $
+
+--- Makefile.in.orig 2002-08-03 02:39:25.000000000 +0200
++++ Makefile.in 2003-04-13 03:05:49.000000000 +0200
+@@ -105,7 +105,7 @@
+
+ pkglocalstatedir = $(localstatedir)/$(PACKAGE)
+
+-sysconf_DATA = ndtpd.conf.sample
++sysconf_DATA =
+ pkglocalstate_DATA =
+
+ EXTRA_DIST = ChangeLog.0 INSTALL-ja README-ja UPGRADE UPGRADE-ja \
+@@ -130,7 +130,7 @@
+ configure configure.ac depcomp install-sh ltmain.sh mdate-sh \
+ missing mkinstalldirs
+ DIST_SUBDIRS = $(SUBDIRS)
+-all: config.h
++all: config.h ndtpd.conf.sample
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+ .SUFFIXES: