ports/116926: Update port: graphics/kbarcode to 2.0.6

[KATO Tsuguru]

>Number:         116926
>Category:       ports
>Synopsis:       Update port: graphics/kbarcode to 2.0.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 04 18:40:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 6.2-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 2.0.6

New file:
files/patch-admin-cvs.sh

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/kbarcode/Makefile graphics/kbarcode/Makefile
--- /usr/ports/graphics/kbarcode/Makefile	Sun May 20 13:51:17 2007
+++ graphics/kbarcode/Makefile	Fri Oct  5 00:51:12 2007
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	kbarcode
-PORTVERSION=	2.0.5
-PORTREVISION=	1
+PORTVERSION=	2.0.6
 CATEGORIES=	graphics kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A barcode and label printing application for KDE
@@ -20,7 +18,15 @@
 USE_KDELIBS_VER=	3
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	automake:19:env autoconf:261:env libtool:15:env
+GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
+
+pre-configure:
+	@cd ${WRKSRC} \
+		&& ${RM} -f admin/libtool.m4.in admin/ltmain.sh \
+		&& ${CP} -f ${LIBTOOL_M4} admin/libtool.m4.in \
+		&& ${CP} -f ${LTMAIN} admin/ltmain.sh \
+		&& ${SETENV} ${MAKE_ENV} UNSERMAKE=no ${GMAKE} -f admin/Makefile.common
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/kbarcode/distinfo graphics/kbarcode/distinfo
--- /usr/ports/graphics/kbarcode/distinfo	Sat Dec  2 03:56:53 2006
+++ graphics/kbarcode/distinfo	Sun Sep 30 21:00:02 2007
@@ -1,3 +1,3 @@
-MD5 (kbarcode-2.0.5.tar.gz) = eff24db3964c3b7bebb3ab4dbc6c6b4e
-SHA256 (kbarcode-2.0.5.tar.gz) = e630a630289c1e4e1928156db26b2f9beaa3e7e41f640734088dea7f1057dfb8
-SIZE (kbarcode-2.0.5.tar.gz) = 1638296
+MD5 (kbarcode-2.0.6.tar.gz) = a265cd935858f2e1425cb195d9d02f3e
+SHA256 (kbarcode-2.0.6.tar.gz) = 090fb401161c29de4d0826ad8d43866d976e131df2f381c4834e147bdc8e854f
+SIZE (kbarcode-2.0.6.tar.gz) = 1832972
diff -urN /usr/ports/graphics/kbarcode/files/patch-admin-cvs.sh graphics/kbarcode/files/patch-admin-cvs.sh
--- /usr/ports/graphics/kbarcode/files/patch-admin-cvs.sh	Thu Jan  1 09:00:00 1970
+++ graphics/kbarcode/files/patch-admin-cvs.sh	Mon Oct  1 03:23:27 2007
@@ -0,0 +1,69 @@
+--- admin/cvs.sh.orig	Sat Sep 29 17:52:39 2007
++++ admin/cvs.sh	Mon Oct  1 03:23:11 2007
+@@ -29,66 +29,9 @@
+ 
+ check_autotool_versions()
+ {
+-required_autoconf_version="2.53 or newer"
+ AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+-case $AUTOCONF_VERSION in
+-  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
+-  "" )
+-    echo "*** AUTOCONF NOT FOUND!."
+-    echo "*** KDE requires autoconf $required_autoconf_version"
+-    exit 1
+-    ;;
+-  * )
+-    echo "*** YOU'RE USING $AUTOCONF_VERSION."
+-    echo "*** KDE requires autoconf $required_autoconf_version"
+-    exit 1
+-    ;;
+-esac
+-
+ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+-case $AUTOHEADER_VERSION in
+-  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+-  "" )
+-    echo "*** AUTOHEADER NOT FOUND!."
+-    echo "*** KDE requires autoheader $required_autoconf_version"
+-    exit 1
+-    ;;
+-  * )
+-    echo "*** YOU'RE USING $AUTOHEADER_VERSION."
+-    echo "*** KDE requires autoheader $required_autoconf_version"
+-    exit 1
+-    ;;
+-esac
+-
+ AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
+-required_automake_version="1.6.1 or newer"
+-case $AUTOMAKE_STRING in
+-  automake*1.5d* | automake*1.5* | automake*1.5-* )
+-    echo "*** YOU'RE USING $AUTOMAKE_STRING."
+-    echo "*** KDE requires automake $required_automake_version"
+-    exit 1
+-    ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
+-    echo "*** $AUTOMAKE_STRING found."
+-    UNSERMAKE=no
+-    ;;
+-  "" )
+-    echo "*** AUTOMAKE NOT FOUND!."
+-    echo "*** KDE requires automake $required_automake_version"
+-    exit 1
+-    ;;
+-  *unsermake* ) :
+-    echo "*** YOU'RE USING UNSERMAKE."
+-    echo "*** GOOD LUCK!! :)"
+-    UNSERMAKE=unsermake
+-    ;;
+-  * )
+-    echo "*** YOU'RE USING $AUTOMAKE_STRING."
+-    echo "*** KDE requires automake $required_automake_version"
+-    exit 1
+-    ;;
+-esac
+-unset required_automake_version
+ }
+ 
+ cvs()
diff -urN /usr/ports/graphics/kbarcode/pkg-plist graphics/kbarcode/pkg-plist
--- /usr/ports/graphics/kbarcode/pkg-plist	Sun May 20 13:51:17 2007
+++ graphics/kbarcode/pkg-plist	Thu Oct  4 21:15:43 2007
@@ -1,5 +1,4 @@
 bin/kbarcode
-lib/kde3/kfile_kbarcode.a
 lib/kde3/kfile_kbarcode.la
 lib/kde3/kfile_kbarcode.so
 share/applications/kde/kbarcode-batch.desktop
>Release-Note:
>Audit-Trail:
>Unformatted: