Date: Wed, 10 Nov 2004 03:00:11 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/73731: Update port: graphics/kbarcode to 1.8.1 Message-ID: <20041110030011.5632da78.tkato432@yahoo.com> Resent-Message-ID: <200411091810.iA9IAVui096297@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73731
>Category: ports
>Synopsis: Update port: graphics/kbarcode to 1.8.1
>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: Tue Nov 09 18:10:31 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.10-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 1.8.1
New file:
files/patch-kbarcode::labeleditor.cpp
files/patch-kbarcode::tokenprovider.h
Remove file:
files/patch-kbarcode_Makefile.in
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/kbarcode/Makefile graphics/kbarcode/Makefile
--- /usr/ports/graphics/kbarcode/Makefile Sat May 22 22:53:00 2004
+++ graphics/kbarcode/Makefile Sat Sep 18 06:15:07 2004
@@ -6,8 +6,7 @@
#
PORTNAME= kbarcode
-PORTVERSION= 1.6.2
-PORTREVISION= 1
+PORTVERSION= 1.8.1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,12 +17,15 @@
RUN_DEPENDS= barcode:${PORTSDIR}/graphics/barcode
USE_KDELIBS_VER= 3
+USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_REINPLACE= yes
post-patch:
- @${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${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
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/kbarcode/distinfo graphics/kbarcode/distinfo
--- /usr/ports/graphics/kbarcode/distinfo Wed Feb 11 12:56:37 2004
+++ graphics/kbarcode/distinfo Sat Sep 18 06:28:52 2004
@@ -1,2 +1,2 @@
-MD5 (kbarcode-1.6.2.tar.gz) = 8a45acb02583c50f0ff363c8c4c78688
-SIZE (kbarcode-1.6.2.tar.gz) = 961761
+MD5 (kbarcode-1.8.1.tar.gz) = 5868383df659a1cf4ba696916c1f12b8
+SIZE (kbarcode-1.8.1.tar.gz) = 969743
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 Thu Jan 1 09:00:00 1970
+++ graphics/kbarcode/files/patch-kbarcode::labeleditor.cpp Sat Nov 6 02:25:48 2004
@@ -0,0 +1,11 @@
+--- 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 Thu Jan 1 09:00:00 1970
+++ graphics/kbarcode/files/patch-kbarcode::tokenprovider.h Mon Aug 23 16:23:54 2004
@@ -0,0 +1,11 @@
+--- 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_Makefile.in graphics/kbarcode/files/patch-kbarcode_Makefile.in
--- /usr/ports/graphics/kbarcode/files/patch-kbarcode_Makefile.in Sat May 22 07:23:08 2004
+++ graphics/kbarcode/files/patch-kbarcode_Makefile.in Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- kbarcode/Makefile.in.orig Fri May 21 23:23:23 2004
-+++ kbarcode/Makefile.in Fri May 21 23:24:01 2004
-@@ -259,7 +259,7 @@
-
- # the application source, library search path, and link libraries
- kbarcode_LDFLAGS = $(KDE_RPATH) $(all_libraries)
--kbarcode_LDADD = $(LIB_KABC) $(LIB_KSPELL) $(LIB_KDEPRINT) $(LIB_KDEUI)
-+kbarcode_LDADD = $(LIB_KABC) $(LIB_KSPELL) $(LIB_KDEPRINT) $(LIB_KDEUI) $(LIBPTHREAD)
- noinst_HEADERS = barcodecache.h barcodecombo.h barcodedialog.h barcodedialogs.h commands.h configdialog.h confwizard.h csvimportdlg.h databasebrowser.h definition.h definitiondialog.h dsmainwindow.h dsrichtext.h kbarcode.h label.h labeleditor.h labelprinter.h labelutils.h mimesources.h multilineeditdlg.h mybarcode.h mycanvasitem.h mycanvasview.h mydatatable.h newlabel.h previewdialog.h printersettings.h printlabeldlg.h rectsettingsdlg.h smalldialogs.h sqltables.h tokenprovider.h xmlutils.h zplutils.h
- kbarcode_SOURCES = barcodecombo.cpp barcodecache.cpp barcodedialog.cpp barcodedialogs.cpp commands.cpp configdialog.cpp confwizard.cpp csvimportdlg.cpp databasebrowser.cpp definition.cpp definitiondialog.cpp dsmainwindow.cpp dsrichtext.cpp kbarcode.cpp label.cpp labeleditor.cpp labelprinter.cpp labelutils.cpp main.cpp mimesources.cpp multilineeditdlg.cpp mybarcode.cpp mycanvasitem.cpp mycanvasview.cpp mydatatable.cpp newlabel.cpp previewdialog.cpp printersettings.cpp printlabeldlg.cpp rectsettingsdlg.cpp smalldialogs.cpp sqltables.cpp tokenprovider.cpp xmlutils.cpp zplutils.cpp
-
diff -urN /usr/ports/graphics/kbarcode/pkg-plist graphics/kbarcode/pkg-plist
--- /usr/ports/graphics/kbarcode/pkg-plist Wed Feb 11 12:56:37 2004
+++ graphics/kbarcode/pkg-plist Mon Aug 23 16:42:35 2004
@@ -1,4 +1,6 @@
bin/kbarcode
+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
@@ -25,7 +27,10 @@
share/locale/fr/LC_MESSAGES/kbarcode.mo
share/locale/hu/LC_MESSAGES/kbarcode.mo
share/locale/it/LC_MESSAGES/kbarcode.mo
+share/locale/nl/LC_MESSAGES/kbarcode.mo
+share/locale/pl/LC_MESSAGES/kbarcode.mo
share/locale/sv/LC_MESSAGES/kbarcode.mo
+share/services/kfile_kbarcode.desktop
@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041110030011.5632da78.tkato432>