From 49dafaed261f545abe741a5b8dd2a00c435e0116 Mon Sep 17 00:00:00 2001 From: seb Date: Thu, 19 Jun 2003 22:08:27 +0000 Subject: Convert to USE_NEW_TEXINFO (via the easy route by converting to buildlink2 too). Remove now unnecessary patch. --- devel/cssc/Makefile | 10 +++++++--- devel/cssc/PLIST | 4 +--- devel/cssc/distinfo | 3 +-- devel/cssc/patches/patch-aa | 41 ----------------------------------------- 4 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 devel/cssc/patches/patch-aa (limited to 'devel/cssc') diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile index c4ff45ea84f..59f1fa2104d 100644 --- a/devel/cssc/Makefile +++ b/devel/cssc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/06/03 09:39:00 seb Exp $ +# $NetBSD: Makefile,v 1.9 2003/06/19 22:08:27 seb Exp $ # DISTNAME= CSSC-0.15alpha.pl0 @@ -12,8 +12,12 @@ COMMENT= GNU workalike for the source code control system SCCS GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-binary +USE_BUILDLINK2= YES +TEST_TARGET= check + +USE_NEW_TEXINFO= YES +USE_MAKEINFO= YES TEXINFO_REQD= 4.0 -TEST_TARGET= check +INFO_FILES= cssc.info -.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cssc/PLIST b/devel/cssc/PLIST index a2ec2c08aff..f980277c8d7 100644 --- a/devel/cssc/PLIST +++ b/devel/cssc/PLIST @@ -1,12 +1,10 @@ -@comment $NetBSD: PLIST,v 1.3 2003/05/30 23:51:25 seb Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/06/19 22:08:28 seb Exp $ bin/sccs -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cssc.info info/cssc.info info/cssc.info-1 info/cssc.info-2 info/cssc.info-3 info/cssc.info-4 -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cssc.info libexec/cssc/admin libexec/cssc/cdc libexec/cssc/delta diff --git a/devel/cssc/distinfo b/devel/cssc/distinfo index 0a48a19c827..33413f05c66 100644 --- a/devel/cssc/distinfo +++ b/devel/cssc/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2003/05/30 23:51:25 seb Exp $ +$NetBSD: distinfo,v 1.3 2003/06/19 22:08:28 seb Exp $ SHA1 (CSSC-0.15alpha.pl0.tar.gz) = b20c672c631561e8c39d465a7fddea444964851f Size (CSSC-0.15alpha.pl0.tar.gz) = 625766 bytes -SHA1 (patch-aa) = 300125779be21c9ac62f77c053bfd30aee2d21df SHA1 (patch-ab) = 648d6379637b791f6aea917e4d3c6379974f04f5 diff --git a/devel/cssc/patches/patch-aa b/devel/cssc/patches/patch-aa deleted file mode 100644 index 2e45a2f48a1..00000000000 --- a/devel/cssc/patches/patch-aa +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2003/05/30 23:51:25 seb Exp $ - ---- docs/Makefile.in.orig 2002-12-08 14:07:19.000000000 +0000 -+++ docs/Makefile.in -@@ -64,7 +64,6 @@ CXX = @CXX@ - CXXCPP = @CXXCPP@ - EXEEXT = @EXEEXT@ - GXX = @GXX@ --MAKEINFO = @MAKEINFO@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PR = @PR@ -@@ -172,23 +171,23 @@ install-info-am: $(INFO_DEPS) - done; \ - done - @$(POST_INSTALL) -- @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ -+ @if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i 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 - - uninstall-info: - $(PRE_UNINSTALL) -- @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ -+ @if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - ii=yes; \ - else ii=; fi; \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ - test -z "$$ii" \ -- || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ -+ || ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ - done - @$(NORMAL_UNINSTALL) - list='$(INFO_DEPS)'; \ -- cgit v1.2.3