Use tail -n +2 instead of tail +2 to work around broken Linux userlands.

While here, move seddery from post-patch to pre-configure.
XXX: it should be replaced with SUBST.

3 files changed, 20 insertions, 14 deletions

diff --git a/time/titrax/Makefile b/time/titrax/Makefile
index 3f4d10ece36..68da545caf5 100644
--- a/time/titrax/Makefile
+++ b/time/titrax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/05/29 23:37:54 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2014/06/29 19:12:51 dholland Exp $
 #
 
 DISTNAME=		titrax-1.98
@@ -20,7 +20,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 USE_IMAKE=		YES
 USE_TOOLS+=		perl:run
 
-post-patch:
+pre-configure:
 	${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.bak
 	${SED}	-e "s|@LOCALBASE@|${LOCALBASE}|g"			\
 		-e "s|@X11BASE@|${X11PREFIX}|g"				\
diff --git a/time/titrax/distinfo b/time/titrax/distinfo
index 93e4e7d99c4..4aa4b44fc05 100644
--- a/time/titrax/distinfo
+++ b/time/titrax/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2011/01/17 12:52:15 he Exp $
+$NetBSD: distinfo,v 1.7 2014/06/29 19:12:51 dholland Exp $
 
 SHA1 (titrax-1.98.tar.gz) = 2849f8930aac945d435f58ad0a2a98fc19477da0
 RMD160 (titrax-1.98.tar.gz) = 519898ed0d74b50d1a01041a6479fb4974823f3e
 Size (titrax-1.98.tar.gz) = 41154 bytes
-SHA1 (patch-aa) = 3e303f061b9f92397f01fe9cb337adfa85194dde
+SHA1 (patch-aa) = 67b1aadb6e8ad5bc86959fe41c71dd5467d35f2c
 SHA1 (patch-ab) = 03ea1f434ab68ccd408830c778a462c083729c95
 SHA1 (patch-ac) = 2fbad9d6cdbc5239cf2a25ab057f640452c5a33e
 SHA1 (patch-ad) = 49ab87c6c5d1574bcef3baf6d0c8a4c8e0220583
diff --git a/time/titrax/patches/patch-aa b/time/titrax/patches/patch-aa
index efa4c3e11e1..829be32cd5f 100644
--- a/time/titrax/patches/patch-aa
+++ b/time/titrax/patches/patch-aa
@@ -1,7 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:20 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2014/06/29 19:12:51 dholland Exp $
 
---- Imakefile.orig	Tue Oct 17 14:44:48 1995
-+++ Imakefile	Tue Dec  8 12:16:34 1998
+- configure for pkgsrc
+- do ratty interpreter fixes (XXX: change to REPLACE_PERL)
+- use tail -n +2 instead of tail +2 to work around broken Linux userlands
+
+--- Imakefile.orig	1995-10-17 13:44:48.000000000 +0000
++++ Imakefile
 @@ -1,10 +1,10 @@
  # Installation options
  #=====================
@@ -15,7 +19,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:20 wiz Exp $
  # PERL - where your Perl executable is located (is in sumtitrax)
  PERL = $(NONXBINDIR)/perl
  #
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ PERL = $(NONXBINDIR)/perl
  # XAWLIB = -lXaw3d
  #
  # If you want to stop UDP packets to the author, uncomment this
@@ -24,7 +28,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:20 wiz Exp $
  #
  # If you have problems with undefined variables, you may have
  # hit the linker bug with SunOS 4.1.2 and X11R4; uncomment this line
-@@ -44,13 +44,13 @@
+@@ -44,13 +44,13 @@ LASTVERSION = V1_97
  # functions that are declared, but not used
  LINTOPTS = -az
  
@@ -41,23 +45,25 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:20 wiz Exp $
  InstallManPage(sumtitra,$(MANDIR))
  InstallNonExec(weekno.perl,$(PERLLIBDIR))
  
-@@ -61,7 +61,7 @@
+@@ -61,14 +61,19 @@ titrax.o: Titrax_ad.h
  # Modifying PERL scripts - technique courtesy of Lindsay (of Zircon fame)
  sumtitra: Makefile
  	mv sumtitra sumtitra.tmp
 -	echo '#!$(PERL)' > sumtitra
+-	tail +2 sumtitra.tmp >> sumtitra
 +	echo '#!$(PERL) -I$(PERLLIBDIR)' > sumtitra
- 	tail +2 sumtitra.tmp >> sumtitra
++	tail -n +2 sumtitra.tmp >> sumtitra
  	rm sumtitra.tmp
  titrat: Makefile
-@@ -69,6 +69,11 @@
+ 	mv titrat titrat.tmp
  	echo '#!$(PERL)' > titrat
- 	tail +2 titrat.tmp >> titrat
+-	tail +2 titrat.tmp >> titrat
++	tail -n +2 titrat.tmp >> titrat
  	rm titrat.tmp
 +weekno.perl: Makefile
 +	mv weekno.perl weekno.perl.tmp
 +	echo '#!$(PERL)' > weekno.perl
-+	tail +2 weekno.perl.tmp >> weekno.perl
++	tail -n +2 weekno.perl.tmp >> weekno.perl
 +	rm weekno.perl.tmp
  
  #------------------------------------------------------------------