diff options
author | seb <seb> | 2003-08-05 22:21:56 +0000 |
---|---|---|
committer | seb <seb> | 2003-08-05 22:21:56 +0000 |
commit | 4fe6abd99754994a31869a7629b4ab8d3d01b0c0 (patch) | |
tree | 3e9a9e262f47c5d1c3c587656ae9e707d6276224 /textproc/ndtpd | |
parent | 2fb875899b4c4cee80ce9258dc823084bd56fa2e (diff) | |
download | pkgsrc-4fe6abd99754994a31869a7629b4ab8d3d01b0c0.tar.gz |
Convert to USE_NEW_TEXINFO.
Remove now unnecessary patch files.
Diffstat (limited to 'textproc/ndtpd')
-rw-r--r-- | textproc/ndtpd/Makefile | 6 | ||||
-rw-r--r-- | textproc/ndtpd/PLIST | 6 | ||||
-rw-r--r-- | textproc/ndtpd/distinfo | 4 | ||||
-rw-r--r-- | textproc/ndtpd/patches/patch-aa | 38 | ||||
-rw-r--r-- | textproc/ndtpd/patches/patch-ab | 38 |
5 files changed, 6 insertions, 86 deletions
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile index 091e75f7700..8d6ef487ae7 100644 --- a/textproc/ndtpd/Makefile +++ b/textproc/ndtpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/07/17 22:54:31 grant Exp $ +# $NetBSD: Makefile,v 1.10 2003/08/05 22:21:56 seb Exp $ # DISTNAME= ndtpd-3.1.4 @@ -15,6 +15,9 @@ USE_PKGINSTALL= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES +USE_NEW_TEXINFO= YES +INFO_FILES= ndtpd-ja.info ndtpd.info + LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -43,5 +46,4 @@ post-install: .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 57164e748b4..3bd63168e38 100644 --- a/textproc/ndtpd/PLIST +++ b/textproc/ndtpd/PLIST @@ -1,15 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2003/04/13 01:29:42 salo Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/08/05 22:21:57 seb 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 info/ndtpd-ja.info-1 info/ndtpd-ja.info-2 info/ndtpd.info info/ndtpd.info-1 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 diff --git a/textproc/ndtpd/distinfo b/textproc/ndtpd/distinfo index e049d8ce6fa..275acafd464 100644 --- a/textproc/ndtpd/distinfo +++ b/textproc/ndtpd/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.3 2003/04/13 01:29:42 salo Exp $ +$NetBSD: distinfo,v 1.4 2003/08/05 22:21:57 seb 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-aa b/textproc/ndtpd/patches/patch-aa deleted file mode 100644 index 6d856fe03e4..00000000000 --- a/textproc/ndtpd/patches/patch-aa +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/03/15 07:19:58 uebayasi Exp $ - ---- doc/Makefile.in.orig Wed Feb 13 23:39:03 2002 -+++ doc/Makefile.in Fri Mar 15 01:05:22 2002 -@@ -177,12 +177,12 @@ - - uninstall-info-am: - $(PRE_UNINSTALL) -- @if (install-info --version && \ -- install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \ -+ @if (${INSTALL_INFO} --version && \ -+ ${INSTALL_INFO} --version | fgrep -i -v debian) >/dev/null 2>&1; then \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ -- echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \ -- install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \ -+ echo " ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \ -+ ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \ - done; \ - else :; fi - @$(NORMAL_UNINSTALL) -@@ -311,12 +311,12 @@ - done; \ - done - @$(POST_INSTALL) -- @if (install-info --version && \ -- install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \ -+ @if (${INSTALL_INFO} --version && \ -+ ${INSTALL_INFO} --version | fgrep -i -v debian) >/dev/null 2>&1; then \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ -- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ -- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ -+ echo " ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ -+ ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ - done; \ - else : ; fi - install-man: diff --git a/textproc/ndtpd/patches/patch-ab b/textproc/ndtpd/patches/patch-ab deleted file mode 100644 index 2c2d646d9b5..00000000000 --- a/textproc/ndtpd/patches/patch-ab +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/03/15 07:19:58 uebayasi Exp $ - ---- doc-ja/Makefile.in.orig Wed Feb 13 23:39:03 2002 -+++ doc-ja/Makefile.in Fri Mar 15 01:05:22 2002 -@@ -179,12 +179,12 @@ - - uninstall-info-am: - $(PRE_UNINSTALL) -- @if (install-info --version && \ -- install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \ -+ @if (${INSTALL_INFO} --version && \ -+ ${INSTALL_INFO} --version | fgrep -i -v debian) >/dev/null 2>&1; then \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ -- echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \ -- install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \ -+ echo " ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \ -+ ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \ - done; \ - else :; fi - @$(NORMAL_UNINSTALL) -@@ -314,12 +314,12 @@ - done; \ - done - @$(POST_INSTALL) -- @if (install-info --version && \ -- install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \ -+ @if (${INSTALL_INFO} --version && \ -+ ${INSTALL_INFO} --version | fgrep -i -v debian) >/dev/null 2>&1; then \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ -- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ -- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ -+ echo " ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ -+ ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ - done; \ - else : ; fi - install-man: |