From 2f192c1af3f110fce17e4ba491e9da969cc926e2 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 15 Mar 2013 23:21:39 +0000 Subject: Update to 1.11: February 19, 2013: Release 1.11 A GeoJSON backend was added; thanks to Christoph Hormann for contributing this. Support for bitfields in the BMP format was added. A minor change was made to the behavior of the alphamax parameter; a value of 0 now gives a true polygon. --- graphics/potrace/Makefile | 5 +- graphics/potrace/distinfo | 11 +-- graphics/potrace/patches/patch-src_Makefile.am | 17 ++++ graphics/potrace/patches/patch-src_Makefile.in | 110 ++++--------------------- 4 files changed, 39 insertions(+), 104 deletions(-) create mode 100644 graphics/potrace/patches/patch-src_Makefile.am (limited to 'graphics') diff --git a/graphics/potrace/Makefile b/graphics/potrace/Makefile index d4cb81ed69b..6ef4663240d 100644 --- a/graphics/potrace/Makefile +++ b/graphics/potrace/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2012/10/06 14:11:15 asau Exp $ +# $NetBSD: Makefile,v 1.9 2013/03/15 23:21:39 wiz Exp $ -DISTNAME= potrace-1.10 -PKGREVISION= 1 +DISTNAME= potrace-1.11 CATEGORIES= graphics MASTER_SITES= http://potrace.sourceforge.net/download/ \ ${MASTER_SITE_SOURCEFORGE:=potrace/} diff --git a/graphics/potrace/distinfo b/graphics/potrace/distinfo index 793a52650a7..b273883a664 100644 --- a/graphics/potrace/distinfo +++ b/graphics/potrace/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.6 2012/04/17 21:56:53 wiz Exp $ +$NetBSD: distinfo,v 1.7 2013/03/15 23:21:39 wiz Exp $ -SHA1 (potrace-1.10.tar.gz) = e6e8b64d85d30b4695d197a79187ac98c2b236f9 -RMD160 (potrace-1.10.tar.gz) = 716d77d5fce7c0bb4bbbbfb0f750aac3376bc028 -Size (potrace-1.10.tar.gz) = 617866 bytes -SHA1 (patch-src_Makefile.in) = e878fc28acd5e31e8271b45419d9d17223c25a9d +SHA1 (potrace-1.11.tar.gz) = 7296baf27bf35298263cb3ed3df34a38fed0b441 +RMD160 (potrace-1.11.tar.gz) = ea03b188e93d02766ff3b546a199fd76bc72271a +Size (potrace-1.11.tar.gz) = 662085 bytes +SHA1 (patch-src_Makefile.am) = e26b4395a7d1b79fe85346a926c348216c870ef3 +SHA1 (patch-src_Makefile.in) = 2bcf24c3104879c12feba6402b9850e11976166a diff --git a/graphics/potrace/patches/patch-src_Makefile.am b/graphics/potrace/patches/patch-src_Makefile.am new file mode 100644 index 00000000000..f9068a456d9 --- /dev/null +++ b/graphics/potrace/patches/patch-src_Makefile.am @@ -0,0 +1,17 @@ +$NetBSD: patch-src_Makefile.am,v 1.1 2013/03/15 23:21:39 wiz Exp $ + +The result of replacing EXTRA_LIBRARIES with lib_LTLIBRARIES +and rerunning automake-1.11.3 to make it install the needed libpotrace. + +--- src/Makefile.am.orig 2013-02-20 00:43:08.000000000 +0000 ++++ src/Makefile.am +@@ -39,8 +39,7 @@ libsources = curve.c curve.h trace.c tra + decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h \ + progress.h + +-lib_LTLIBRARIES = $(INSTLIBS) +-EXTRA_LTLIBRARIES = libpotrace.la ++lib_LTLIBRARIES = libpotrace.la + libpotrace_la_SOURCES = $(libsources) + libpotrace_la_LDFLAGS = -version-info 0:1:0 -rpath '$(libdir)' \ + -export-symbols $(srcdir)/libpotrace-export.sym -no-undefined diff --git a/graphics/potrace/patches/patch-src_Makefile.in b/graphics/potrace/patches/patch-src_Makefile.in index 6653bd9ded3..3492f5b5a25 100644 --- a/graphics/potrace/patches/patch-src_Makefile.in +++ b/graphics/potrace/patches/patch-src_Makefile.in @@ -1,50 +1,11 @@ -$NetBSD: patch-src_Makefile.in,v 1.1 2012/04/17 21:56:53 wiz Exp $ +$NetBSD: patch-src_Makefile.in,v 1.2 2013/03/15 23:21:39 wiz Exp $ The result of replacing EXTRA_LIBRARIES with lib_LTLIBRARIES and rerunning automake-1.11.3 to make it install the needed libpotrace. -Some chunks probably unnecessary, but this works, so not cleaned up. ---- src/Makefile.in.orig 2011-08-19 15:09:02.000000000 +0000 +--- src/Makefile.in.orig 2013-02-20 00:49:08.000000000 +0000 +++ src/Makefile.in -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -+# Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -42,10 +42,7 @@ subdir = src - DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ -- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ -- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ -- $(top_srcdir)/configure.ac -+am__aclocal_m4_deps = $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -73,6 +70,12 @@ am__nobase_list = $(am__nobase_strip_set - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } - am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(includedir)" - LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -266,8 +269,7 @@ libsources = curve.c curve.h trace.c tra +@@ -296,8 +339,7 @@ libsources = curve.c curve.h trace.c tra decompose.h potracelib.c potracelib.h lists.h auxiliary.h bitmap.h \ progress.h @@ -52,64 +13,21 @@ Some chunks probably unnecessary, but this works, so not cleaned up. -EXTRA_LTLIBRARIES = libpotrace.la +lib_LTLIBRARIES = libpotrace.la libpotrace_la_SOURCES = $(libsources) - libpotrace_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)' \ + libpotrace_la_LDFLAGS = -version-info 0:1:0 -rpath '$(libdir)' \ -export-symbols $(srcdir)/libpotrace-export.sym -no-undefined -@@ -347,8 +349,8 @@ clean-libLTLIBRARIES: +@@ -372,14 +415,14 @@ uninstall-libLTLIBRARIES: + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done --libpotrace.la: $(libpotrace_la_OBJECTS) $(libpotrace_la_DEPENDENCIES) + libpotrace.la: $(libpotrace_la_OBJECTS) $(libpotrace_la_DEPENDENCIES) $(EXTRA_libpotrace_la_DEPENDENCIES) - $(libpotrace_la_LINK) $(libpotrace_la_OBJECTS) $(libpotrace_la_LIBADD) $(LIBS) -+libpotrace.la: $(libpotrace_la_OBJECTS) $(libpotrace_la_DEPENDENCIES) $(EXTRA_libpotrace_la_DEPENDENCIES) -+ $(libpotrace_la_LINK) -rpath $(libdir) $(libpotrace_la_OBJECTS) $(libpotrace_la_LIBADD) $(LIBS) ++ $(AM_V_CCLD)$(libpotrace_la_LINK) -rpath $(libdir) $(libpotrace_la_OBJECTS) $(libpotrace_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" -@@ -392,13 +394,13 @@ clean-binPROGRAMS: - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --mkbitmap$(EXEEXT): $(mkbitmap_OBJECTS) $(mkbitmap_DEPENDENCIES) -+mkbitmap$(EXEEXT): $(mkbitmap_OBJECTS) $(mkbitmap_DEPENDENCIES) $(EXTRA_mkbitmap_DEPENDENCIES) - @rm -f mkbitmap$(EXEEXT) - $(LINK) $(mkbitmap_OBJECTS) $(mkbitmap_LDADD) $(LIBS) --potrace$(EXEEXT): $(potrace_OBJECTS) $(potrace_DEPENDENCIES) -+potrace$(EXEEXT): $(potrace_OBJECTS) $(potrace_DEPENDENCIES) $(EXTRA_potrace_DEPENDENCIES) - @rm -f potrace$(EXEEXT) - $(LINK) $(potrace_OBJECTS) $(potrace_LDADD) $(LIBS) --potracelib_demo$(EXEEXT): $(potracelib_demo_OBJECTS) $(potracelib_demo_DEPENDENCIES) -+potracelib_demo$(EXEEXT): $(potracelib_demo_OBJECTS) $(potracelib_demo_DEPENDENCIES) $(EXTRA_potracelib_demo_DEPENDENCIES) - @rm -f potracelib_demo$(EXEEXT) - $(LINK) $(potracelib_demo_OBJECTS) $(potracelib_demo_LDADD) $(LIBS) - -@@ -473,9 +475,7 @@ uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- test -n "$$files" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(includedir)" && rm -f $$files -+ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -@@ -578,10 +578,15 @@ install-am: all-am - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ if test -z '$(STRIP)'; then \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ install; \ -+ else \ -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ -+ fi - mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) - + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ -- cgit v1.2.3