Changes 0.99:

** New features
   Support for i18n.
   Change license to GPLv3 or later version.
   SVG support.
   Added support for PCL output.

11 files changed, 95 insertions, 132 deletions

diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile
index 761bf35e325..5e55c0cbe80 100644
--- a/graphics/barcode/Makefile
+++ b/graphics/barcode/Makefile
@@ -1,27 +1,18 @@
-# $NetBSD: Makefile,v 1.16 2013/04/06 20:27:21 rodent Exp $
-#
+# $NetBSD: Makefile,v 1.17 2013/10/06 17:15:35 adam Exp $
 
-DISTNAME=	barcode-0.98
+DISTNAME=	barcode-0.99
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU:=barcode/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ar.linux.it/software/barcode/
 COMMENT=	Create bar codes as EPS (program and library)
+LICENSE=	gnu-gpl-v3
 
-GNU_CONFIGURE=	YES
-MAKE_ENV+=	AWK=${AWK:Q}
-INFO_FILES=	yes
-
-INSTALL_MAKE_FLAGS=					\
-	BINDIR=${DESTDIR}${PREFIX}/bin			\
-	INCDIR=${DESTDIR}${PREFIX}/include		\
-	LIBDIR=${DESTDIR}${PREFIX}/lib			\
-	INFODIR=${DESTDIR}${PREFIX}/${PKGINFODIR}	\
-	MAN1DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1	\
-	MAN3DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
-
-# man/man1/barcode.1
-CONFLICTS+=	xscreensaver<5.00
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+INFO_FILES=		yes
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/barcode/PLIST b/graphics/barcode/PLIST
index 21a5b737303..a664d7a0021 100644
--- a/graphics/barcode/PLIST
+++ b/graphics/barcode/PLIST
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/04 14:45:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/10/06 17:15:35 adam Exp $
 bin/barcode
-include/barcode.h
+bin/sample
 info/barcode.info
-lib/libbarcode.a
-man/man1/barcode.1
-man/man3/barcode.3
diff --git a/graphics/barcode/distinfo b/graphics/barcode/distinfo
index 8cab1c511d2..f445bee5c1a 100644
--- a/graphics/barcode/distinfo
+++ b/graphics/barcode/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2008/09/08 05:13:12 dholland Exp $
+$NetBSD: distinfo,v 1.6 2013/10/06 17:15:35 adam Exp $
 
-SHA1 (barcode-0.98.tar.gz) = 15b9598bcaa67bcff1f63309d1a18840b9a12899
-RMD160 (barcode-0.98.tar.gz) = 13685a100a151149a83d28a46372cf562fd750ba
-Size (barcode-0.98.tar.gz) = 335658 bytes
-SHA1 (patch-aa) = eb0812ae80a65828a20021ba1e718488899c212d
-SHA1 (patch-ab) = 166fce927fdb3ce77600f3fbab3b28faa7c9d340
-SHA1 (patch-ac) = 9e0ea49bb4b647d6daeb9666f0546dd0101fb507
-SHA1 (patch-ad) = eebbcda1403794f16e0de01134c2949cf3ec43fa
+SHA1 (barcode-0.99.tar.xz) = a6283a844ebfdccc9458256e5e6db15760348384
+RMD160 (barcode-0.99.tar.xz) = 57d91ddf49595ef29d83b5c3515727b8a04ccbf8
+Size (barcode-0.99.tar.xz) = 586028 bytes
+SHA1 (patch-Makefile.in) = 75b316c0e240966cb87eb3c57c0a48b96a615c3e
+SHA1 (patch-barcode.h) = 5c8409cf67428e0448872291555b178beca2c741
+SHA1 (patch-main.c) = 924a01db8fa3a33ce4ba7b050aefd4fd6019f58d
+SHA1 (patch-sample.c) = d143a473a2cebbc485220321323e81caf36b38b9
diff --git a/graphics/barcode/patches/patch-Makefile.in b/graphics/barcode/patches/patch-Makefile.in
new file mode 100644
index 00000000000..7b0900bea76
--- /dev/null
+++ b/graphics/barcode/patches/patch-Makefile.in
@@ -0,0 +1,33 @@
+$NetBSD: patch-Makefile.in,v 1.1 2013/10/06 17:15:35 adam Exp $
+
+Don't build nor use libgnu.
+
+--- Makefile.in.orig	2013-03-29 23:01:35.000000000 +0000
++++ Makefile.in
+@@ -142,7 +142,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
+ PROGRAMS = $(bin_PROGRAMS)
+ am_barcode_OBJECTS = main.$(OBJEXT) cmdline.$(OBJEXT)
+ barcode_OBJECTS = $(am_barcode_OBJECTS)
+-barcode_DEPENDENCIES = libbarcode.la lib/libgnu.la
++barcode_DEPENDENCIES = libbarcode.la
+ am_sample_OBJECTS = sample.$(OBJEXT)
+ sample_OBJECTS = $(am_sample_OBJECTS)
+ sample_DEPENDENCIES = libbarcode.la
+@@ -1253,7 +1253,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = po doc lib
++SUBDIRS = po doc
+ AM_CFLAGS = -Ilib @CFLAGS@ @DEFS@ @NO_LIBPAPER@ @NO_STRERROR@
+ AM_LDFLAGS = -L. @LIBPAPER@
+ EXTRA_DIST = barcode.h cmdline.h
+@@ -1264,7 +1264,7 @@ libbarcode_la_SOURCES = library.c ean.c 
+ 		ps.c svg.c pcl.c code11.c
+ 
+ barcode_SOURCES = main.c cmdline.c
+-barcode_LDADD = libbarcode.la lib/libgnu.la
++barcode_LDADD = libbarcode.la
+ sample_SOURCES = sample.c
+ sample_LDADD = libbarcode.la
+ all: config.h
diff --git a/graphics/barcode/patches/patch-aa b/graphics/barcode/patches/patch-aa
deleted file mode 100644
index 3ae82755041..00000000000
--- a/graphics/barcode/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/06/27 08:50:03 seb Exp $
-
---- Makefile.in.orig	2001-10-17 13:26:21.000000000 +0000
-+++ Makefile.in
-@@ -55,7 +55,7 @@ $(LIBRARY): $(LIBOBJECTS)
- 	$(RANLIB) $(LIBRARY)
- 
- $(MAN1) $(MAN3): doc/doc.$(TARGET)
--	awk -f doc/manpager doc/doc.$(TARGET)
-+	${AWK} -f doc/manpager doc/doc.$(TARGET)
- 
- 
- # Unfortunately, pmake has no "-C". Also, "pmake -n" doesn't follow the cd.
-@@ -63,8 +63,12 @@ $(INFO): doc/doc.$(TARGET)
- 	cd doc && $(MAKE) 
- 
- install:
--	$(INSTALL) -d $(BINDIR) $(INCDIR) $(LIBDIR) $(MAN1DIR) \
--		$(MAN3DIR) $(INFODIR)
-+	$(INSTALL) -d $(BINDIR)
-+	$(INSTALL) -d $(INCDIR)
-+	$(INSTALL) -d $(LIBDIR)
-+	$(INSTALL) -d $(MAN1DIR)
-+	$(INSTALL) -d $(MAN3DIR)
-+	$(INSTALL) -d $(INFODIR)
- 	$(INSTALL) -c $(TARGET) $(BINDIR)
- 	$(INSTALL) -c -m 0644 $(HEADER) $(INCDIR)
- 	$(INSTALL) -c -m 0644  $(LIBRARY) $(LIBDIR)
diff --git a/graphics/barcode/patches/patch-ab b/graphics/barcode/patches/patch-ab
deleted file mode 100644
index ce8bf9ac476..00000000000
--- a/graphics/barcode/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/06/27 08:50:03 seb Exp $
-
---- doc/doc.barcode.orig	2002-03-01 22:41:50.000000000 +0000
-+++ doc/doc.barcode
-@@ -43,6 +43,11 @@ This file is the User's Manual for the b
- 
- @end ifinfo
- 
-+@dircategory Miscellaneous
-+@direntry
-+* Barcode: (barcode).             A barcode generation program and library.
-+@end direntry
-+
- @setchapternewpage odd
- @titlepage
- @c use the new format for titles
diff --git a/graphics/barcode/patches/patch-ac b/graphics/barcode/patches/patch-ac
deleted file mode 100644
index d8f93c5ad72..00000000000
--- a/graphics/barcode/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/06/27 08:50:04 seb Exp $
-
---- doc/barcode.info.orig	2002-03-01 22:56:47.000000000 +0000
-+++ doc/barcode.info
-@@ -13,6 +13,11 @@ Barcode tools
-    This file documents version 0.98 of the barcode library and sample
- programs (March 2002).
- 
-+INFO-DIR-SECTION Miscellaneous
-+START-INFO-DIR-ENTRY
-+* Barcode: (barcode).             A barcode generation program and library.
-+END-INFO-DIR-ENTRY
-+
- * Menu:
- 
- * Overview::
diff --git a/graphics/barcode/patches/patch-ad b/graphics/barcode/patches/patch-ad
deleted file mode 100644
index ad69453e4ee..00000000000
--- a/graphics/barcode/patches/patch-ad
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/09/08 05:13:12 dholland Exp $
-
---- doc/manpager~	2001-10-16 10:12:22.000000000 -0400
-+++ doc/manpager	2008-09-08 01:09:13.000000000 -0400
-@@ -32,20 +32,20 @@ SKIP==1         {next}
- # (ARub, Oct 10 2000)
- /@b\{/ {
-   #$0 = gensub(/@b\{([^}]+)\}/, "\\\\fB\\1\\\\fP","g");
--  gsub("@b\{","\\fB");
--  gsub("\}","\\fP");
-+  gsub("@b\\{","\\fB");
-+  gsub("\\}","\\fP");
- } 
- 
- /@var\{/ {
-   #$0 = gensub(/@var\{([^}]+)\}/, "\\\\fI\\1\\\\fP","g");
--  gsub("@var\{","\\fB");
--  gsub("\}","\\fP");
-+  gsub("@var\\{","\\fB");
-+  gsub("\\}","\\fP");
- } 
- 
- /@(samp|code|file)\{/ {
-   #$0 = gensub(/@(samp|code|file)\{([^}]+)\}/, "`\\2'","g");
--  gsub("@(samp|code|file)\{","");
--  gsub("\}","");
-+  gsub("@(samp|code|file)\\{","");
-+  gsub("\\}","");
- }
- 
- 
-@@ -54,8 +54,8 @@ SKIP==1         {next}
- }
- 
- /@ref\{.*\}/ {
--  gsub("@ref\{","");
--  gsub("\}","");
-+  gsub("@ref\\{","");
-+  gsub("\\}","");
- }
- 
- /@\*/ {
diff --git a/graphics/barcode/patches/patch-barcode.h b/graphics/barcode/patches/patch-barcode.h
new file mode 100644
index 00000000000..601db84109a
--- /dev/null
+++ b/graphics/barcode/patches/patch-barcode.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-barcode.h,v 1.1 2013/10/06 17:15:35 adam Exp $
+
+Avoid double symbols: define 'streaming' as 'extern'.
+
+--- barcode.h.orig	2013-10-06 07:42:33.000000000 +0000
++++ barcode.h
+@@ -123,6 +123,6 @@ extern int Barcode_Version(char *version
+ }
+ #endif
+ 
+-int streaming;
++extern int streaming;
+ 
+ #endif /* _BARCODE_H_ */
diff --git a/graphics/barcode/patches/patch-main.c b/graphics/barcode/patches/patch-main.c
new file mode 100644
index 00000000000..baf406fa1b0
--- /dev/null
+++ b/graphics/barcode/patches/patch-main.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-main.c,v 1.1 2013/10/06 17:15:35 adam Exp $
+
+Avoid double symbols: define one global variable 'streaming'.
+
+--- main.c.orig	2013-03-29 22:22:24.000000000 +0000
++++ main.c
+@@ -32,6 +32,8 @@
+ #include <paper.h>
+ #endif
+ 
++int streaming;
++
+ /*
+  * Most of this file deals with command line options, by exploiting
+  * the cmdline.[ch] engine to offer defaults via environment variables
diff --git a/graphics/barcode/patches/patch-sample.c b/graphics/barcode/patches/patch-sample.c
new file mode 100644
index 00000000000..7896e3a5e09
--- /dev/null
+++ b/graphics/barcode/patches/patch-sample.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-sample.c,v 1.1 2013/10/06 17:15:35 adam Exp $
+
+Avoid double symbols: define one global variable 'streaming'.
+
+--- sample.c.orig	2013-10-06 07:47:28.000000000 +0000
++++ sample.c
+@@ -4,6 +4,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++int streaming;
++
+ int main(int argc, char **argv)
+ {
+     int pcl = 0, oflags;