CVS commit: pkgsrc/textproc/detex

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 12 10:56:51 UTC 2017

Modified Files:
        pkgsrc/textproc/detex: Makefile distinfo
        pkgsrc/textproc/detex/patches: patch-aa

Log Message:
Honor LDFLAGS. Fixes RELRO build.

Set LICENSE while here.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/detex/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/detex/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/detex/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/detex/Makefile
diff -u pkgsrc/textproc/detex/Makefile:1.14 pkgsrc/textproc/detex/Makefile:1.15
--- pkgsrc/textproc/detex/Makefile:1.14 Thu Oct 25 06:55:45 2012
+++ pkgsrc/textproc/detex/Makefile      Wed Jul 12 10:56:51 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/25 06:55:45 asau Exp $
-#
+# $NetBSD: Makefile,v 1.15 2017/07/12 10:56:51 wiz Exp $
 
 DISTNAME=      detex-2.8
 CATEGORIES=    textproc
@@ -9,6 +8,7 @@ EXTRACT_SUFX=   .tar
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.cs.purdue.edu/homes/trinkle/detex/
 COMMENT=       Remove LaTeX commands
+LICENSE=       modified-bsd # nearly
 
 USE_TOOLS+=    lex
 

Index: pkgsrc/textproc/detex/distinfo
diff -u pkgsrc/textproc/detex/distinfo:1.10 pkgsrc/textproc/detex/distinfo:1.11
--- pkgsrc/textproc/detex/distinfo:1.10 Wed Nov  4 01:59:26 2015
+++ pkgsrc/textproc/detex/distinfo      Wed Jul 12 10:56:51 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 01:59:26 agc Exp $
+$NetBSD: distinfo,v 1.11 2017/07/12 10:56:51 wiz Exp $
 
 SHA1 (detex-2.8.tar) = 57691f8e4dd52cbf632f38abebfd8c3725de019b
 RMD160 (detex-2.8.tar) = 983ea90de9e3559317baf4a71de0e8de47863b7d
 SHA512 (detex-2.8.tar) = 5afd54aebc3a018e9b72a5e5f37d05858b0b90c1165ec725b08995f5338479153a04ff938a2f54543108c66ac2f66d2c06159d331c9cde304ebce32b527c737f
 Size (detex-2.8.tar) = 318976 bytes
-SHA1 (patch-aa) = 4ad2937ed0c6fbd00b3767c8bdeb92dd1e7e5652
+SHA1 (patch-aa) = fc0bfd8144608dbd8b1f8ff74eb2da73e62495e4
 SHA1 (patch-ab) = b9fe692f1dbbb96c6d249c702f53f15658d01d0a

Index: pkgsrc/textproc/detex/patches/patch-aa
diff -u pkgsrc/textproc/detex/patches/patch-aa:1.4 pkgsrc/textproc/detex/patches/patch-aa:1.5
--- pkgsrc/textproc/detex/patches/patch-aa:1.4  Thu Nov 20 02:19:26 2008
+++ pkgsrc/textproc/detex/patches/patch-aa      Wed Jul 12 10:56:51 2017
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2008/11/20 02:19:26 chuck Exp $
+$NetBSD: patch-aa,v 1.5 2017/07/12 10:56:51 wiz Exp $
 
---- Makefile.orig      2008-11-19 20:18:35.000000000 -0500
-+++ Makefile   2008-11-19 20:19:26.000000000 -0500
-@@ -69,7 +69,7 @@
+Chunks 1 & 2: ?
+Chunk 3: honor LDFLAGS.
+
+--- Makefile.orig      2008-02-01 19:55:51.000000000 +0000
++++ Makefile
+@@ -69,7 +69,7 @@ DEFS =
  #
  #DEFS += ${DEFS} -DNO_MALLOC_DECL
  #
@@ -11,7 +14,7 @@ $NetBSD: patch-aa,v 1.4 2008/11/20 02:19
  
  # Use your favorite lexical scanner
  #
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ LEX  = lex
  
  # scanner library
  #
@@ -20,3 +23,12 @@ $NetBSD: patch-aa,v 1.4 2008/11/20 02:19
  #LEXLIB       = -lfl
  
  LPR   = lpr -p
+@@ -104,7 +104,7 @@ D_OBJ      = detex.o
+ all:  ${PROGS}
+ 
+ detex: ${D_OBJ}
+-      ${CC} ${CFLAGS} -o $@ ${D_OBJ} ${LEXLIB}
++      ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${D_OBJ} ${LEXLIB}
+ 
+ detex.c:
+       sed -f states.sed detex.l > xxx.l