Date: Fri, 31 Mar 2006 01:00:26 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/95112: Update port: graphics/kbarcode to 2.0.0 Message-ID: <20060331010026.06255986.tkato432@yahoo.com> Resent-Message-ID: <200603301610.k2UGAMF9075007@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95112
>Category: ports
>Synopsis: Update port: graphics/kbarcode to 2.0.0
>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 Mar 30 16:10:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p15 i386
>Organization:
>Environment:
>Description:
- Update to version 2.0.0
Remove file:
files/patch-kbarcode::labeleditor.cpp
files/patch-kbarcode::tokenprovider.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/kbarcode/Makefile graphics/kbarcode/Makefile
--- /usr/ports/graphics/kbarcode/Makefile Fri Feb 24 00:39:43 2006
+++ graphics/kbarcode/Makefile Wed Mar 22 02:04:33 2006
@@ -6,8 +6,7 @@
#
PORTNAME= kbarcode
-PORTVERSION= 1.8.1
-PORTREVISION= 3
+PORTVERSION= 2.0.0
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,18 +14,17 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= A barcode and label printing application for KDE
-RUN_DEPENDS= barcode:${PORTSDIR}/graphics/barcode
-
-USE_KDELIBS_VER=3
-USE_REINPLACE= yes
+USE_KDELIBS_VER= 3
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
+.include <bsd.port.pre.mk>
+
post-patch:
- @${REINPLACE_CMD} -e 's,-O2,,g ; \
- s,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/${CONFIGURE_SCRIPT}
- @${REINPLACE_CMD} -e \
- 's,$$(LIB_KDEUI)$$,$$(LIB_KDEUI) $$(LIBPTHREAD),g' \
- ${WRKSRC}/kbarcode/Makefile.in
+.if ${OSVERSION} < 500000
+ @${REINPLACE_CMD} -e 's/ or / || /g ; \
+ s/ and / \&\& /g ; \
+ s/return false/return 0/g' ${WRKSRC}/kbarcode/tec.cpp
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/graphics/kbarcode/distinfo graphics/kbarcode/distinfo
--- /usr/ports/graphics/kbarcode/distinfo Sat Nov 26 19:25:11 2005
+++ graphics/kbarcode/distinfo Thu Mar 16 12:25:11 2006
@@ -1,3 +1,3 @@
-MD5 (kbarcode-1.8.1.tar.gz) = 5868383df659a1cf4ba696916c1f12b8
-SHA256 (kbarcode-1.8.1.tar.gz) = 6cbeec0639bda9ce163b4cc5466f739163abfcda23a3af7a50eb2160a366a517
-SIZE (kbarcode-1.8.1.tar.gz) = 969743
+MD5 (kbarcode-2.0.0.tar.gz) = 381e75baf0fb551538c8edc8cc40e525
+SHA256 (kbarcode-2.0.0.tar.gz) = f96afc9e65ca00af1a23b31e26ab667dc3d584c18d3b9fb054d6bccbfd5b7cb7
+SIZE (kbarcode-2.0.0.tar.gz) = 1158671
diff -urN /usr/ports/graphics/kbarcode/files/patch-kbarcode::labeleditor.cpp graphics/kbarcode/files/patch-kbarcode::labeleditor.cpp
--- /usr/ports/graphics/kbarcode/files/patch-kbarcode::labeleditor.cpp Wed Nov 10 07:06:44 2004
+++ graphics/kbarcode/files/patch-kbarcode::labeleditor.cpp Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- kbarcode/labeleditor.cpp.orig Tue Jul 20 05:57:28 2004
-+++ kbarcode/labeleditor.cpp Mon Aug 23 17:25:56 2004
-@@ -552,7 +552,7 @@
- exportZPLAct = new KAction( i18n("...as &IPL or ZPL"), 0, 0, this, SLOT(exportZPL() ), actionCollection() );
- descriptionAct = new KAction( i18n("&Change description..."), 0, 0, this, SLOT(changeDes()), actionCollection() );
- deleteAct = new KAction( i18n("&Delete Object"), QIconSet( BarIcon("editdelete") ), Key_Delete, cv, SLOT( deleteCurrent() ), actionCollection() );
-- editPropAct = new KAction( i18n("&Properties..."), 0, 0, this, SLOT(), actionCollection() );
-+ editPropAct = new KAction( i18n("&Properties..."), 0, 0, this, SLOT( doubleClickedCurrent() ), actionCollection() );
- printAct = KStdAction::print( this, SLOT( print() ), actionCollection(), "print" );
- changeSizeAct = new KAction( i18n("&Change Label..."), 0, 0, this, SLOT( changeSize() ), actionCollection() );
- barcodeAct = new KAction( i18n("Insert &Barcode"), QIconSet( BarIcon("barcode") ), 0, this, SLOT( insertBarcode() ), actionCollection() );
diff -urN /usr/ports/graphics/kbarcode/files/patch-kbarcode::tokenprovider.h graphics/kbarcode/files/patch-kbarcode::tokenprovider.h
--- /usr/ports/graphics/kbarcode/files/patch-kbarcode::tokenprovider.h Wed Nov 10 07:06:44 2004
+++ graphics/kbarcode/files/patch-kbarcode::tokenprovider.h Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- kbarcode/tokenprovider.h.orig Wed Jun 30 17:18:40 2004
-+++ kbarcode/tokenprovider.h Mon Aug 23 16:23:32 2004
-@@ -18,6 +18,8 @@
- #ifndef TOKENPROVIDER_H
- #define TOKENPROVIDER_H
-
-+#include <time.h>
-+
- #include <qstring.h>
- #include <qregexp.h>
-
diff -urN /usr/ports/graphics/kbarcode/files/patch-kbarcode::zplutils.cpp graphics/kbarcode/files/patch-kbarcode::zplutils.cpp
--- /usr/ports/graphics/kbarcode/files/patch-kbarcode::zplutils.cpp Fri Dec 26 21:41:16 2003
+++ graphics/kbarcode/files/patch-kbarcode::zplutils.cpp Thu Mar 16 13:05:46 2006
@@ -1,11 +1,11 @@
---- kbarcode/zplutils.cpp.orig Wed Nov 5 20:26:46 2003
-+++ kbarcode/zplutils.cpp Fri Dec 26 10:22:53 2003
-@@ -307,7 +307,7 @@
- setField( "<ESC>E3<CAN>" ); // choose format number 3
+--- kbarcode/zplutils.cpp.orig Mon Mar 21 00:31:21 2005
++++ kbarcode/zplutils.cpp Thu Mar 16 12:27:36 2006
+@@ -256,7 +256,7 @@
+ ipl += field( "<ESC>E3<CAN>" ); // choose format number 3
+
+ for( unsigned int i = 0; i < m_values.count(); i++ )
+- ipl += field( m_values[i] + ( i != m_values.count() - 1 ? "<CR>" : QString::null ) );
++ ipl += field( m_values[i] + ( i != m_values.count() - 1 ? QString("<CR>") : QString::null ) );
- for( unsigned int i = 0; i < values.count(); i++ )
-- setField( values[i] + ( i != values.count() - 1 ? "<CR>" : QString::null ) );
-+ setField( values[i] + ( i != values.count() - 1 ? QString("<CR>") : QString::null ) );
-
// end actual data
- setField( "<ETB>" );
+ ipl += field( "<ETB>" );
diff -urN /usr/ports/graphics/kbarcode/pkg-plist graphics/kbarcode/pkg-plist
--- /usr/ports/graphics/kbarcode/pkg-plist Fri Feb 24 00:39:43 2006
+++ graphics/kbarcode/pkg-plist Thu Mar 16 14:25:22 2006
@@ -2,11 +2,12 @@
lib/kde3/kfile_kbarcode.a
lib/kde3/kfile_kbarcode.la
lib/kde3/kfile_kbarcode.so
-share/applnk/Applications/KBarcode/kbarcode-batch.desktop
-share/applnk/Applications/KBarcode/kbarcode-editor.desktop
-share/applnk/Applications/KBarcode/kbarcode-label.desktop
-share/applnk/Applications/KBarcode/kbarcode-single.desktop
-share/applnk/Applications/KBarcode/kbarcode.desktop
+share/applications/kde/kbarcode-batch.desktop
+share/applications/kde/kbarcode-editor.desktop
+share/applications/kde/kbarcode-label.desktop
+share/applications/kde/kbarcode-single.desktop
+share/applications/kde/kbarcode.desktop
+share/apps/kbarcode/barcode.ps
share/apps/kbarcode/barcodes.html
share/apps/kbarcode/exampledata.sql
share/apps/kbarcode/labeldefinitions.sql
@@ -42,6 +43,5 @@
@dirrmtry share/icons
@dirrm share/apps/kbarcode
@dirrmtry share/apps
-@dirrm share/applnk/Applications/KBarcode
-@dirrmtry share/applnk/Applications
-@dirrmtry share/applnk
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060331010026.06255986.tkato432>