CVS commit: pkgsrc/graphics/giflib

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Sep 19 09:01:15 UTC 2024

Modified Files:
        pkgsrc/graphics/giflib: distinfo
        pkgsrc/graphics/giflib/patches: patch-Makefile

Log Message:
giflib: Simplify patches.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/giflib/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/giflib/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/graphics/giflib/distinfo
diff -u pkgsrc/graphics/giflib/distinfo:1.29 pkgsrc/graphics/giflib/distinfo:1.30
--- pkgsrc/graphics/giflib/distinfo:1.29        Wed Sep 18 23:02:59 2024
+++ pkgsrc/graphics/giflib/distinfo     Thu Sep 19 09:01:15 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2024/09/18 23:02:59 nia Exp $
+$NetBSD: distinfo,v 1.30 2024/09/19 09:01:15 nia Exp $
 
 BLAKE2s (giflib-5.2.2.tar.gz) = 2a24163a1af876f9241b5971a7e523f054d131661435e4a3ab11b7cf6acc20f1
 SHA512 (giflib-5.2.2.tar.gz) = 0865ab2b1904fa14640c655fdb14bb54244ad18a66e358565c00287875d00912343f9be8bfac7658cc0146200d626f7ec9160d7a339f20ba3be6b9941d73975f
 Size (giflib-5.2.2.tar.gz) = 447175 bytes
-SHA1 (patch-Makefile) = 9c76f45626d7e4a406df89aef051a73dbc56ddb8
+SHA1 (patch-Makefile) = f7dcce252760dfdcafee46513936d6a2a6fcd668

Index: pkgsrc/graphics/giflib/patches/patch-Makefile
diff -u pkgsrc/graphics/giflib/patches/patch-Makefile:1.8 pkgsrc/graphics/giflib/patches/patch-Makefile:1.9
--- pkgsrc/graphics/giflib/patches/patch-Makefile:1.8   Wed Sep 18 23:02:59 2024
+++ pkgsrc/graphics/giflib/patches/patch-Makefile       Thu Sep 19 09:01:15 2024
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile,v 1.8 2024/09/18 23:02:59 nia Exp $
+$NetBSD: patch-Makefile,v 1.9 2024/09/19 09:01:15 nia Exp $
 
 - Libtoolize.
-- Allow override of PREFIX and MANDIR.
+- Allow override of PREFIX.
 - Allow separate installation of utilities.
 - Move quantize.c back into libgif.so to fix various library users.
 
 --- Makefile.orig      2024-02-19 01:01:50.000000000 +0000
 +++ Makefile
-@@ -8,17 +8,17 @@
+@@ -8,13 +8,13 @@
  #
  OFLAGS = -O0 -g
  OFLAGS  = -O2
@@ -23,11 +23,6 @@ $NetBSD: patch-Makefile,v 1.8 2024/09/18
  BINDIR = $(PREFIX)/bin
  INCDIR = $(PREFIX)/include
  LIBDIR = $(PREFIX)/lib
--MANDIR = $(PREFIX)/share/man
-+MANDIR?= $(PREFIX)/share/man
- 
- # No user-serviceable parts below this line
- 
 @@ -29,13 +29,13 @@ LIBPOINT=0
  LIBVER=$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT)
  
@@ -51,7 +46,7 @@ $NetBSD: patch-Makefile,v 1.8 2024/09/18
        gifwedge
  
 -LDLIBS=libgif.a -lm
-+LDLIBS=-L$(PREFIX)/lib $(COMPILER_RPATH_FLAG)$(PREFIX)/lib -lgif -lm
++LDLIBS=-lm
  
  MANUAL_PAGES = \
        doc/gif2rgb.xml \
@@ -99,7 +94,7 @@ $NetBSD: patch-Makefile,v 1.8 2024/09/18
  
 -libgif.a: $(OBJECTS) $(HEADERS)
 -      $(AR) rcs libgif.a $(OBJECTS)
-+$(UTILS): .libs/libgif.a .libs/libutil.a
++$(UTILS): .libs/libutil.a .libs/libgif.a
 +
 +$(LIBGIFSO): $(OBJECTS) $(HEADERS)
 +      $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -version-info $(LIBMAJOR):0:0 -rpath $(PREFIX)/lib -o $(LIBGIFSO) $(OBJECTS)