Quick fix: install the include file; remove patches

5 files changed, 5 insertions, 48 deletions

diff --git a/graphics/potrace/Makefile b/graphics/potrace/Makefile
index 023871d5f7d..2bab0d80ad1 100644
--- a/graphics/potrace/Makefile
+++ b/graphics/potrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/02/08 17:53:51 adam Exp $
+# $NetBSD: Makefile,v 1.12 2017/02/08 18:03:27 adam Exp $
 
 DISTNAME=	potrace-1.13
 CATEGORIES=	graphics
@@ -12,6 +12,7 @@ LICENSE=	gnu-gpl-v2
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-libpotrace
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/potrace/PLIST b/graphics/potrace/PLIST
index 0d71f2c2654..dbe45cbd6f5 100644
--- a/graphics/potrace/PLIST
+++ b/graphics/potrace/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2012/04/17 21:56:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/02/08 18:03:27 adam Exp $
 bin/mkbitmap
 bin/potrace
+include/potracelib.h
 lib/libpotrace.la
 man/man1/mkbitmap.1
 man/man1/potrace.1
diff --git a/graphics/potrace/distinfo b/graphics/potrace/distinfo
index cac20292526..8738bd83fdf 100644
--- a/graphics/potrace/distinfo
+++ b/graphics/potrace/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.9 2017/02/08 17:53:51 adam Exp $
+$NetBSD: distinfo,v 1.10 2017/02/08 18:03:27 adam Exp $
 
 SHA1 (potrace-1.13.tar.gz) = fe8e42e0b5f7d3130b494818d6b1872e29097cd5
 RMD160 (potrace-1.13.tar.gz) = ff51f938641bfc81236dd4daba54c00915e883c0
 SHA512 (potrace-1.13.tar.gz) = d7b1e72bee388aa309a5fbf3944b9409d912f2ed8a089a44dfca597b55d88bdf08778d40fc487e6689a873631c24cd393894ff353442dc778dfd0d3068121484
 Size (potrace-1.13.tar.gz) = 605931 bytes
-SHA1 (patch-src_Makefile.am) = 4476e3719269afd1d8455eca89baba8feeaaa18d
-SHA1 (patch-src_Makefile.in) = a4eae96751dc22a75594e91347bff6c4e6aff45c
diff --git a/graphics/potrace/patches/patch-src_Makefile.am b/graphics/potrace/patches/patch-src_Makefile.am
deleted file mode 100644
index a1d54c1867d..00000000000
--- a/graphics/potrace/patches/patch-src_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_Makefile.am,v 1.2 2017/02/08 17:53:52 adam 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	2015-10-23 01:25:37.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:3: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
deleted file mode 100644
index db2e4ae0155..00000000000
--- a/graphics/potrace/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.3 2017/02/08 17:53:52 adam 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.in.orig	2015-10-23 01:42:02.000000000 +0000
-+++ src/Makefile.in
-@@ -378,8 +378,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:3:0 -rpath '$(libdir)' \
-  -export-symbols $(srcdir)/libpotrace-export.sym -no-undefined
-@@ -464,7 +463,7 @@ clean-libLTLIBRARIES:
- 	}
- 
- libpotrace.la: $(libpotrace_la_OBJECTS) $(libpotrace_la_DEPENDENCIES) $(EXTRA_libpotrace_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libpotrace_la_LINK)  $(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)
- 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \