CVS commit: pkgsrc/graphics/jbigkit

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Nov  9 17:55:32 UTC 2023

Modified Files:
        pkgsrc/graphics/jbigkit: distinfo
        pkgsrc/graphics/jbigkit/patches: patch-ab

Log Message:
jbigkit: Fix linking utility programs on platforms without RPATH support.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/jbigkit/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/jbigkit/patches/patch-ab

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

Modified files:

Index: pkgsrc/graphics/jbigkit/distinfo
diff -u pkgsrc/graphics/jbigkit/distinfo:1.10 pkgsrc/graphics/jbigkit/distinfo:1.11
--- pkgsrc/graphics/jbigkit/distinfo:1.10       Tue Oct 26 10:46:20 2021
+++ pkgsrc/graphics/jbigkit/distinfo    Thu Nov  9 17:55:32 2023
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:46:20 nia Exp $
+$NetBSD: distinfo,v 1.11 2023/11/09 17:55:32 nia Exp $
 
 BLAKE2s (jbigkit-2.1.tar.gz) = 89a8bd02633f134248d80250f92dda1099cf8d0f0dc1487ead4848cfd2c9d379
 SHA512 (jbigkit-2.1.tar.gz) = c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
 Size (jbigkit-2.1.tar.gz) = 438710 bytes
 SHA1 (patch-Makefile) = 3b5e5814be3f361b1ce5ffdd483e4078b94c4bf6
 SHA1 (patch-aa) = 7786ab0be7e718549da37378588a8ba55ef8f187
-SHA1 (patch-ab) = 893a3eeb636a92199d3759255b3ebef6d646d01e
+SHA1 (patch-ab) = 3f9c2016a696ba61943518fb7ab94b95c047d633
 SHA1 (patch-libjbig_jbig.c) = 398c5e8b34f651be1d374dd7641526303231ea3a
 SHA1 (patch-libjbig_jbig.h) = c073578e4da787f51adf9214b31b6ac45734951f

Index: pkgsrc/graphics/jbigkit/patches/patch-ab
diff -u pkgsrc/graphics/jbigkit/patches/patch-ab:1.6 pkgsrc/graphics/jbigkit/patches/patch-ab:1.7
--- pkgsrc/graphics/jbigkit/patches/patch-ab:1.6        Thu Jul  6 13:13:30 2017
+++ pkgsrc/graphics/jbigkit/patches/patch-ab    Thu Nov  9 17:55:32 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2017/07/06 13:13:30 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2023/11/09 17:55:32 nia Exp $
 
 * prevent to overwrite our CC/CFLAGS settings
 * libtoolize
@@ -32,22 +32,22 @@ $NetBSD: patch-ab,v 1.6 2017/07/06 13:13
 -pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
 -      $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
 +pbmtojbg: pbmtojbg.lo ../libjbig/libjbig.la
-+      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg pbmtojbg.lo ../libjbig/libjbig.la -R ${PREFIX}/lib
++      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg pbmtojbg.lo ../libjbig/libjbig.la -rpath ${PREFIX}/lib
  
 -jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
 -      $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
 +jbgtopbm: jbgtopbm.lo ../libjbig/libjbig.la
-+      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm jbgtopbm.lo ../libjbig/libjbig.la -R ${PREFIX}/lib
++      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm jbgtopbm.lo ../libjbig/libjbig.la -rpath ${PREFIX}/lib
  
 -pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a
 -      $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85
 +pbmtojbg85: pbmtojbg85.lo ../libjbig/libjbig85.la
-+      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg85 pbmtojbg85.lo ../libjbig/libjbig85.la -R ${PREFIX}/lib
++      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg85 pbmtojbg85.lo ../libjbig/libjbig85.la -rpath ${PREFIX}/lib
  
 -jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a
 -      $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
 +jbgtopbm85: jbgtopbm85.lo ../libjbig/libjbig85.la
-+      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm85 jbgtopbm85.lo ../libjbig/libjbig85.la -R ${PREFIX}/lib
++      ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm85 jbgtopbm85.lo ../libjbig/libjbig85.la -rpath ${PREFIX}/lib
  
 -jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
 -pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h