Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Apr 2015 06:53:25 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r384209 - in head/japanese/gawk: . files
Message-ID:  <201504180653.t3I6rPgJ012927@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat Apr 18 06:53:24 2015
New Revision: 384209
URL: https://svnweb.freebsd.org/changeset/ports/384209

Log:
  japanese/gawk: Don't install ancient info page
  
  The version of makeinfo in the texinfo package, the one that FreeBSD 11
  and DragonFly use because texinfo is no longer in base, is too new to
  create the info page on this ancient port.
  
  It would be preferred to either update japanese/gawk to match the same
  version as textproc/gawk, or just remove the port completely.  However,
  for some reason it's a dependency over textproc/gawk on two of rodrigo's
  ports.
  
  I initially tried using extra-patches to only block info on FreeBSD 11
  and DragonFly, but Makefile.in is already patched and it was getting
  complicated so I decided just to remove the old info page for everyone.
  The man page is still installed of course.
  
  Approved by:	blanket (unbreaks F11)

Added:
  head/japanese/gawk/files/patch-doc_Makefile.in   (contents, props changed)
Modified:
  head/japanese/gawk/Makefile
  head/japanese/gawk/files/patch-Makefile.in

Modified: head/japanese/gawk/Makefile
==============================================================================
--- head/japanese/gawk/Makefile	Sat Apr 18 06:17:02 2015	(r384208)
+++ head/japanese/gawk/Makefile	Sat Apr 18 06:53:24 2015	(r384209)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gawk
 PORTVERSION=	3.0.6
+PORTREVISION=	1
 CATEGORIES=	japanese lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,13 +17,10 @@ COMMENT=	GNU awk + multi-byte extension
 
 LICENSE=	GPLv2
 
-USES=		makeinfo
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-bitops --enable-non-decimal-data
 MAKE_JOBS_UNSAFE=	yes
 
-INFO=		gawk
-
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
 OPTIONS_DEFINE=	DOCS

Modified: head/japanese/gawk/files/patch-Makefile.in
==============================================================================
--- head/japanese/gawk/files/patch-Makefile.in	Sat Apr 18 06:17:02 2015	(r384208)
+++ head/japanese/gawk/files/patch-Makefile.in	Sat Apr 18 06:53:24 2015	(r384209)
@@ -1,9 +1,19 @@
---- Makefile.in.orig	Mon Jul 16 20:42:58 2001
-+++ Makefile.in	Mon Jul 16 20:48:25 2001
-@@ -194,14 +194,8 @@
+--- Makefile.in.orig	2015-04-18 06:35:02 UTC
++++ Makefile.in
+@@ -102,7 +102,7 @@ COPIES = missing/system.c missing/tzset.
+ 	missing/strerror.c missing/strtod.c \
+ 	missing/strftime.c missing/strftime.3 
+ 
+-DOCS= doc/gawk.1 doc/gawk.texi doc/texinfo.tex
++DOCS= doc/gawk.1
+ 
+ TEXFILES= doc/gawk.aux doc/gawk.cp doc/gawk.cps doc/gawk.fn doc/gawk.fns \
+ 	  doc/gawk.ky doc/gawk.kys doc/gawk.pg doc/gawk.pgs doc/gawk.toc \
+@@ -193,21 +193,15 @@ alloca.o:	alloca.c
+ 
  mbc.o: Makefile
  
- install:	gawk info installdirs
+-install:	gawk info installdirs
 -	-rm -f $(bindir)/gawk
 -	fullname=gawk-$(REL).`./gawk '{print $$3}' $(srcdir)/patchlevel.h`+mb$(MBREL) ; \
 -	$(INSTALL_PROGRAM) gawk $(bindir)/$$fullname ; \
@@ -12,8 +22,16 @@
 -	if [ ! -f awk ]; \
 -	then	$(LN_S) gawk awk; \
 -	fi; exit 0)
++install:	gawk installdirs
 +	$(INSTALL_PROGRAM) gawk \
 +		$(bindir)/$(binprefix)gawk$(exec_suffix)
  	cd doc && $(MAKE) install
  	cd awklib && $(MAKE) install
  
+ installdirs: mkinstalldirs
+ 	$(srcdir)/mkinstalldirs $(bindir) $(datadir) \
+-		$(libdir) $(infodir) $(mandir) $(libexecdir)
++		$(libdir) $(mandir) $(libexecdir)
+ 
+ install-strip:
+ 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install

Added: head/japanese/gawk/files/patch-doc_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/gawk/files/patch-doc_Makefile.in	Sat Apr 18 06:53:24 2015	(r384209)
@@ -0,0 +1,23 @@
+--- doc/Makefile.in.orig	2000-06-07 08:48:18 UTC
++++ doc/Makefile.in
+@@ -47,7 +47,7 @@ TROFF = groff -t -Tps
+ SEDME = sed -e "s/^level0 restore/level0 restore flashme 100 72 moveto (Copyright `date '+%m-%d-%y %T'`, FSF, Inc. (all)) show/" \
+ 		-e "s/^\/level0 save def/\/level0 save def 30 -48 translate/"
+ 
+-DOCS= gawk.1 igawk.1 gawk.texi
++DOCS= gawk.1 igawk.1 
+ 
+ TEXFILES= gawk.aux gawk.cp gawk.cps gawk.fn gawk.fns gawk.ky gawk.kys \
+ 	   gawk.pg gawk.pgs gawk.toc gawk.tp gawk.tps gawk.vr gawk.vrs
+@@ -67,9 +67,9 @@ AWKCARD = awkcard.ps
+ # to ensure that awkcard.tr is processed by tbl.
+ #AWKCARD = awkcard.nc
+ 
+-all: $(DOCS) info
++all: $(DOCS)
+ 
+-install: $(mandir)/gawk$(manext) $(mandir)/igawk$(manext) $(infodir)/gawk.info
++install: $(mandir)/gawk$(manext) $(mandir)/igawk$(manext)
+ 
+ $(infodir)/gawk.info::
+ 	-if test -f gawk.info; then d=.; \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504180653.t3I6rPgJ012927>