diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index f31f89e391a..da1a6b16188 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.47 2008/01/04 17:48:35 espie Exp $ +# $OpenBSD: Makefile,v 1.48 2008/04/22 19:20:59 naddy Exp $ COMMENT= toolkit for converting images between different formats -DISTNAME= netpbm-10.26.46 +DISTNAME= netpbm-10.26.53 SHARED_LIBS= netpbm 1.0 CATEGORIES= graphics HOMEPAGE= http://netpbm.sourceforge.net/ diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index a071d2f5a76..b46e20b58fd 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,5 +1,5 @@ -MD5 (netpbm-10.26.46.tgz) = N6Bx3r/OHdlZYmdEj0tWyA== -RMD160 (netpbm-10.26.46.tgz) = 9NHXJ+DN9U9uUjA3vVFDj76/JX8= -SHA1 (netpbm-10.26.46.tgz) = a053nT0zxzhGrevsWf9qhmstdrY= -SHA256 (netpbm-10.26.46.tgz) = vSVtmI6v730AogDfdfsm8WANQkl9yBq1XRCOfKltSo8= -SIZE (netpbm-10.26.46.tgz) = 2542956 +MD5 (netpbm-10.26.53.tgz) = M7cUXzI7PykH7tO2aIoNUA== +RMD160 (netpbm-10.26.53.tgz) = /NocTKuMr59FzuejGD4omrI0S74= +SHA1 (netpbm-10.26.53.tgz) = 6Zf34yLi4mK8QZ33xSdVc5XybFQ= +SHA256 (netpbm-10.26.53.tgz) = k1YgaSmUuY8XOdFCm33UMfzYPNJD52B3e516WERrdeM= +SIZE (netpbm-10.26.53.tgz) = 2544017 diff --git a/graphics/netpbm/patches/patch-lib_Makefile b/graphics/netpbm/patches/patch-lib_Makefile index 365bb1cd9a7..2e7ae05317c 100644 --- a/graphics/netpbm/patches/patch-lib_Makefile +++ b/graphics/netpbm/patches/patch-lib_Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-lib_Makefile,v 1.2 2007/05/09 15:47:57 naddy Exp $ ---- lib/Makefile.orig Wed Dec 8 05:32:37 2004 -+++ lib/Makefile Wed May 9 16:32:31 2007 +$OpenBSD: patch-lib_Makefile,v 1.3 2008/04/22 19:20:59 naddy Exp $ +--- lib/Makefile.orig Thu Dec 13 17:23:52 2007 ++++ lib/Makefile Tue Apr 22 21:15:55 2008 @@ -35,6 +35,9 @@ endif # Library objects to be linked but not built by Makefile.common: LIBOBJECTS_X = util/shhopt.o util/nstring.o @@ -31,17 +31,19 @@ $OpenBSD: patch-lib_Makefile,v 1.2 2007/05/09 15:47:57 naddy Exp $ rm -f $@ $(SYMLINK) $< $@ # The $(SONAME) link is needed only to test the programs without -@@ -110,8 +117,8 @@ libnetpbm.$(NETPBMLIBSUFFIX): $(SONAME) +@@ -110,9 +117,9 @@ libnetpbm.$(NETPBMLIBSUFFIX): $(SONAME) $(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) rm -f $@ $(SYMLINK) $< $@ -libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) - $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ +- $(SHLIB_CLIB) -lm $(LADD) +libnetpbm.$(NETPBMLIBSUFFIX).$(LIBnetpbm_VERSION): $(SHLIBOBJECTS) $(SHLIBOBJECTS_X) + $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(SHLIBOBJECTS_X) \ - $(SHLIB_CLIB) $(LADD) ++ $(SHLIB_CLIB) $(LADD) endif + ifeq ($(NETPBMLIBTYPE),dll) @@ -179,7 +186,7 @@ endif compile.h: $(SRCDIR)/buildtools/stamp-date >$@ || rm $@