CVS commit: pkgsrc/print/transfig

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jul 15 14:09:23 UTC 2017

Modified Files:
        pkgsrc/print/transfig: distinfo
        pkgsrc/print/transfig/patches: patch-aa patch-ac

Log Message:
Honor LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/transfig/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/transfig/patches/patch-aa
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/transfig/patches/patch-ac

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

Modified files:

Index: pkgsrc/print/transfig/distinfo
diff -u pkgsrc/print/transfig/distinfo:1.22 pkgsrc/print/transfig/distinfo:1.23
--- pkgsrc/print/transfig/distinfo:1.22 Wed Nov  4 01:03:01 2015
+++ pkgsrc/print/transfig/distinfo      Sat Jul 15 14:09:22 2017
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.22 2015/11/04 01:03:01 agc Exp $
+$NetBSD: distinfo,v 1.23 2017/07/15 14:09:22 wiz Exp $
 
 SHA1 (transfig.3.2.5e.tar.gz) = 27aa9691bf84f8775db9be39c453a8132148bad1
 RMD160 (transfig.3.2.5e.tar.gz) = cc919f081483c3f570abeca6a8cadd4796d25015
 SHA512 (transfig.3.2.5e.tar.gz) = ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
 Size (transfig.3.2.5e.tar.gz) = 531256 bytes
-SHA1 (patch-aa) = bd898082a8c34825efe04d0102ddb33b2f4cffbd
+SHA1 (patch-aa) = 1c831b806eca90142348aab8e565d020466e6a96
 SHA1 (patch-ab) = b056ff88914bccfc172f15adb663eda0f254e125
-SHA1 (patch-ac) = 0258794cf6f6d22d3355ed01c2cc89c7ee0088d4
+SHA1 (patch-ac) = 6508bac36a86a69b910f5e3b4f08e09a25055dfe
 SHA1 (patch-ae) = d38a07c99e27606a238b3dc89cd938ed9635291d
 SHA1 (patch-fig2dev_dev_genibmgl.c) = 86d75d687066e77f90f5e35914a5edc409708e3e

Index: pkgsrc/print/transfig/patches/patch-aa
diff -u pkgsrc/print/transfig/patches/patch-aa:1.11 pkgsrc/print/transfig/patches/patch-aa:1.12
--- pkgsrc/print/transfig/patches/patch-aa:1.11 Wed Aug 20 10:25:12 2008
+++ pkgsrc/print/transfig/patches/patch-aa      Sat Jul 15 14:09:23 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2008/08/20 10:25:12 is Exp $
+$NetBSD: patch-aa,v 1.12 2017/07/15 14:09:23 wiz Exp $
 
---- fig2dev/Imakefile.orig     Fri Oct 28 01:56:02 2005
-+++ fig2dev/Imakefile  Wed Nov  9 22:49:57 2005
-@@ -34,7 +34,7 @@
+--- fig2dev/Imakefile.orig     2010-06-02 19:18:16.000000000 +0000
++++ fig2dev/Imakefile
+@@ -34,7 +34,7 @@ XCOMM ******
  XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
  XCOMM and installed xfig.
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.11 2008/08/20 10:2
  
  XCOMM ******
  XCOMM If your system doesn't have the strerror() function (has sys_errlist) then
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ XCOMM Uncomment the following line if yo
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.11 2008/08/20 10:2
  
  XCOMM ****************
  XCOMM Change RGB if necessary, to point to your rgb.txt color database
-@@ -76,7 +76,7 @@
+@@ -76,7 +76,7 @@ XCOMM file are in different places
  #ifdef USEPNG
  PNGLIBDIR = $(USRLIBDIR)
  ZLIBDIR = $(USRLIBDIR)
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.11 2008/08/20 10:2
  #endif
  
  XCOMM ****************
-@@ -92,7 +92,19 @@
+@@ -92,7 +92,19 @@ XCOMM
  
  #ifdef USEXPM
  XPMLIBDIR = $(USRLIBDIR)
@@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.11 2008/08/20 10:2
  #endif
  
  XCOMM ****************
-@@ -141,8 +153,8 @@
+@@ -141,8 +153,8 @@ XCOMM Comment out the next line if you h
  
  #ifdef I18N
  I18N_DEFS = -DI18N 
@@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.11 2008/08/20 10:2
  
  #endif /* I18N */
  
-@@ -150,30 +162,37 @@
+@@ -150,30 +162,37 @@ XCOMM **********************************
  XCOMM *** You shouldn't have to change anything below this point ***
  XCOMM **************************************************************
  
@@ -105,7 +105,7 @@ $NetBSD: patch-aa,v 1.11 2008/08/20 10:2
                $(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
  
  #define IHaveSubdirs
-@@ -189,9 +208,9 @@
+@@ -189,9 +208,9 @@ INCLUDES = -I..
  
  LOCAL_LIBRARIES = $(LIBTRANSFIG)
  #if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
@@ -117,3 +117,8 @@ $NetBSD: patch-aa,v 1.11 2008/08/20 10:2
  #endif
  DEPLIBS = $(LIBTRANSFIG)
  
+@@ -255,3 +274,4 @@ pic2tpic.man:: ../doc/pic2tpic.1
+       $(RM) pic2tpic.man
+       -$(LN) ../doc/pic2tpic.1 pic2tpic.man
+ 
++LOCAL_LDFLAGS=        ${LDFLAGS}

Index: pkgsrc/print/transfig/patches/patch-ac
diff -u pkgsrc/print/transfig/patches/patch-ac:1.4 pkgsrc/print/transfig/patches/patch-ac:1.5
--- pkgsrc/print/transfig/patches/patch-ac:1.4  Thu Nov 10 14:29:01 2005
+++ pkgsrc/print/transfig/patches/patch-ac      Sat Jul 15 14:09:23 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/11/10 14:29:01 itohy Exp $
+$NetBSD: patch-ac,v 1.5 2017/07/15 14:09:23 wiz Exp $
 
---- transfig/Imakefile.orig    Wed Mar 26 05:52:37 2003
-+++ transfig/Imakefile Wed Nov  9 21:44:38 2005
-@@ -32,7 +32,7 @@
+--- transfig/Imakefile.orig    2003-03-25 20:52:38.000000000 +0000
++++ transfig/Imakefile
+@@ -32,7 +32,7 @@ XCOMM Uncomment the USELATEX2E flag to u
  XCOMM \\usepackage{} command for LaTeX2e. 
  XCOMM The default is to use \\documentstyle{} for LaTeX209.
  
@@ -11,3 +11,9 @@ $NetBSD: patch-ac,v 1.4 2005/11/10 14:29
  
  XCOMM ******* DON'T CHANGE ANYTHING BELOW THIS POINT *******
  
+@@ -68,3 +68,5 @@ pic2tpic.man:: ../doc/pic2tpic.1
+ 
+ clean::
+       rm -f *.man
++
++LOCAL_LDFLAGS=        ${LDFLAGS}