On Mon, Jan 21, 2008 at 08:32:13PM -0500, Okan Demirmen wrote: > On Tue 2008.01.22 at 01:08 +0100, Andreas Bihlmaier wrote: > > Hello, > > > > I finally found some time to get (and dependency net/yaz) > > up-to-date. > > > > Tested @i386, @sparc64. > > [snip] > > > The upstream developer knows that one of the regress tests is broken and > > thus already disabled upstream as well. > > > > Please somebody commit this together with yaz! > > Remember to delete old (now empty) patches. > > i'm not familiar with this port, but is there a reason not to add > lang/python to MODULES? it'll use python2.5 - does tellico work with > 2.5? > > cheers, > okan Of course you are right, for some reason I didn't use lang/python before, but well it works, thus new patch (also removes old patches):
Index: Makefile =================================================================== RCS file: /cvs/ports/x11/tellico/Makefile,v retrieving revision 1.6 diff -u -u -r1.6 Makefile --- Makefile 26 Dec 2007 13:46:19 -0000 1.6 +++ Makefile 22 Jan 2008 10:08:19 -0000 @@ -1,16 +1,15 @@ -# $OpenBSD: Makefile,v 1.6 2007/12/26 13:46:19 sturm Exp $ +# $OpenBSD: Makefile,v 1.3 2007/04/28 16:15:41 espie Exp $ COMMENT= organizer for book/dvd/music collections CATEGORIES= databases x11 HOMEPAGE= http://www.periapsis.org/tellico/ MASTER_SITES= ${HOMEPAGE}download/ -DISTNAME= tellico-1.2.10 -PKGNAME= ${DISTNAME}p2 +DISTNAME= tellico-1.2.14 MAINTAINER= Andreas Bihlmaier <[EMAIL PROTECTED]> -MODULES= x11/kde +MODULES= x11/kde lang/python # GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes @@ -20,15 +19,15 @@ USE_LIBTOOL= Yes USE_GMAKE= Yes CONFIGURE_STYLE=gnu +CONFIGURE_ENV=${MODKDE_CONFIGURE_ENV} CONFIGURE_ARGS=${MODKDE_CONFIGURE_ARGS} \ --disable-libsuffix \ --disable-static \ --enable-shared \ --enable-final -RUN_DEPENDS= ::lang/python/2.4 \ - :desktop-file-utils-*:devel/desktop-file-utils -BUILD_DEPENDS= ::lang/python/2.4 +RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils + LIB_DEPENDS= ${MODQT_LIB_DEPENDS} \ kdecore.>=6,DCOP,kabc,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,knewstuff,kparts,kresources,kutils,kwalletclient,vcard::x11/kde/libs3 \ @@ -39,9 +38,8 @@ WANTLIB += ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c crypto WANTLIB += exslt gcrypt gpg-error iconv idn intl jpeg m pcre pcreposix -WANTLIB += png pthread ssl stdc++ util xml2 xslt z +WANTLIB += png pthread ssl stdc++ util xml2 xslt z fam rpcsvc -CONFIGURE_ENV=${MODKDE_CONFIGURE_ENV} MAKE_FLAGS=${MODKDE_MAKE_FLAGS} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/x11/tellico/distinfo,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 distinfo --- distinfo 8 Apr 2007 21:21:14 -0000 1.1.1.1 +++ distinfo 22 Jan 2008 10:08:19 -0000 @@ -1,5 +1,5 @@ -MD5 (tellico-1.2.10.tar.gz) = GpgoudjBjaHJPoEEf6Q8vQ== -RMD160 (tellico-1.2.10.tar.gz) = vjsUkRSYcnggWOod3t8fHYEc2i0= -SHA1 (tellico-1.2.10.tar.gz) = v5DTtGYRuhCb/Xk+6zbOsNSymuM= -SHA256 (tellico-1.2.10.tar.gz) = bJwQW/C3H5EeVQtKDnpfzrlRbjJ60/m6YviazEBibYk= -SIZE (tellico-1.2.10.tar.gz) = 4707394 +MD5 (tellico-1.2.14.tar.gz) = OAR+J9SCdX+ul3+kmAmnhA== +RMD160 (tellico-1.2.14.tar.gz) = 5NQ/d3DyFoZ65SO5HytrS7R1Cec= +SHA1 (tellico-1.2.14.tar.gz) = hhkwk2KymfSoEDPmMM8Msq74i9I= +SHA256 (tellico-1.2.14.tar.gz) = 0WFVCx16aLoQd/BzzU6AJAU2RynwqQaWNc6KcBFgr30= +SIZE (tellico-1.2.14.tar.gz) = 4802694 Index: patches/patch-src_tests_Makefile_am =================================================================== RCS file: patches/patch-src_tests_Makefile_am diff -N patches/patch-src_tests_Makefile_am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_tests_Makefile_am 22 Jan 2008 10:08:19 -0000 @@ -0,0 +1,27 @@ +$OpenBSD$ +--- src/tests/Makefile.am.orig Sun Jan 13 20:06:17 2008 ++++ src/tests/Makefile.am Sun Jan 13 20:06:39 2008 +@@ -4,13 +4,12 @@ KDE_OPTIONS = noautodist + + AM_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) $(X_LDFLAGS) + +-check_PROGRAMS = isbntest latin1test entitytest formattest ++check_PROGRAMS = isbntest latin1test entitytest + +-check: isbntest latin1test entitytest formattest ++check: isbntest latin1test entitytest + ./isbntest + ./latin1test + ./entitytest +- ./formattest + + METASOURCES = AUTO + +@@ -25,5 +24,5 @@ latin1test_LDADD = $(LIB_QT) $(LIB_KDECORE) + entitytest_SOURCES = entitytest.cpp + entitytest_LDADD = ../tellico_utils.o $(LIB_QT) $(LIB_KDECORE) + +-formattest_SOURCES = formattest.cpp +-formattest_LDADD = ../core/tellico_config.o ../core/tellico_config_addons.o ../field.o ../tellico_utils.o $(LIB_QT) $(LIB_KDECORE) ++#formattest_SOURCES = formattest.cpp ++#formattest_LDADD = ../core/tellico_config.o ../core/tellico_config_addons.o ../field.o ../tellico_utils.o $(LIB_QT) $(LIB_KDECORE) Index: patches/patch-src_tests_Makefile_in =================================================================== RCS file: patches/patch-src_tests_Makefile_in diff -N patches/patch-src_tests_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_tests_Makefile_in 22 Jan 2008 10:08:19 -0000 @@ -0,0 +1,89 @@ +$OpenBSD$ +--- src/tests/Makefile.in.orig Sun Jan 13 20:52:05 2008 ++++ src/tests/Makefile.in Sun Jan 13 20:52:07 2008 +@@ -38,7 +38,7 @@ build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ + check_PROGRAMS = isbntest$(EXEEXT) latin1test$(EXEEXT) \ +- entitytest$(EXEEXT) formattest$(EXEEXT) ++ entitytest$(EXEEXT) + subdir = src/tests + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -56,13 +56,13 @@ entitytest_OBJECTS = entitytest.$(OBJEXT) + am__DEPENDENCIES_1 = + entitytest_DEPENDENCIES = ../tellico_utils.o $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +-am_formattest_OBJECTS = formattest.$(OBJEXT) ++#am_formattest_OBJECTS = formattest.$(OBJEXT) + #>- formattest_OBJECTS = $(am_formattest_OBJECTS) + #>+ 1 +-formattest_OBJECTS = formattest.$(OBJEXT) +-formattest_DEPENDENCIES = ../core/tellico_config.o \ +- ../core/tellico_config_addons.o ../field.o ../tellico_utils.o \ +- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++#formattest_OBJECTS = formattest.$(OBJEXT) ++#formattest_DEPENDENCIES = ../core/tellico_config.o \ ++# ../core/tellico_config_addons.o ../field.o ../tellico_utils.o \ ++# $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + am_isbntest_OBJECTS = isbntest.$(OBJEXT) + #>- isbntest_OBJECTS = $(am_isbntest_OBJECTS) + #>+ 1 +@@ -95,9 +95,9 @@ CXXLD = $(CXX) + #>+ 2 + CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(entitytest_SOURCES) $(formattest_SOURCES) \ ++SOURCES = $(entitytest_SOURCES) \ + $(isbntest_SOURCES) $(latin1test_SOURCES) +-DIST_SOURCES = $(entitytest_SOURCES) $(formattest_SOURCES) \ ++DIST_SOURCES = $(entitytest_SOURCES) \ + $(isbntest_SOURCES) $(latin1test_SOURCES) + ETAGS = etags + CTAGS = ctags +@@ -379,8 +379,8 @@ latin1test_SOURCES = latin1test.cpp + latin1test_LDADD = $(LIB_QT) $(LIB_KDECORE) + entitytest_SOURCES = entitytest.cpp + entitytest_LDADD = ../tellico_utils.o $(LIB_QT) $(LIB_KDECORE) +-formattest_SOURCES = formattest.cpp +-formattest_LDADD = ../core/tellico_config.o ../core/tellico_config_addons.o ../field.o ../tellico_utils.o $(LIB_QT) $(LIB_KDECORE) ++#formattest_SOURCES = formattest.cpp ++#formattest_LDADD = ../core/tellico_config.o ../core/tellico_config_addons.o ../field.o ../tellico_utils.o $(LIB_QT) $(LIB_KDECORE) + #>- all: all-am + #>+ 1 + all: docs-am all-am +@@ -439,9 +439,9 @@ clean-checkPROGRAMS: + entitytest$(EXEEXT): $(entitytest_OBJECTS) $(entitytest_DEPENDENCIES) + @rm -f entitytest$(EXEEXT) + $(CXXLINK) $(entitytest_LDFLAGS) $(entitytest_OBJECTS) $(entitytest_LDADD) $(LIBS) +-formattest$(EXEEXT): $(formattest_OBJECTS) $(formattest_DEPENDENCIES) +- @rm -f formattest$(EXEEXT) +- $(CXXLINK) $(formattest_LDFLAGS) $(formattest_OBJECTS) $(formattest_LDADD) $(LIBS) ++#formattest$(EXEEXT): $(formattest_OBJECTS) $(formattest_DEPENDENCIES) ++# @rm -f formattest$(EXEEXT) ++# $(CXXLINK) $(formattest_LDFLAGS) $(formattest_OBJECTS) $(formattest_LDADD) $(LIBS) + isbntest$(EXEEXT): $(isbntest_OBJECTS) $(isbntest_DEPENDENCIES) + @rm -f isbntest$(EXEEXT) + $(CXXLINK) $(isbntest_LDFLAGS) $(isbntest_OBJECTS) $(isbntest_LDADD) $(LIBS) +@@ -456,7 +456,7 @@ distclean-compile: + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ + +@@ -665,11 +665,10 @@ uninstall-am: uninstall-info-am + tags uninstall uninstall-am uninstall-info-am + + +-check: isbntest latin1test entitytest formattest ++check: isbntest latin1test entitytest + ./isbntest + ./latin1test + ./entitytest +- ./formattest + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: Index: patches/patch-src_translators_freedb_util_cpp =================================================================== RCS file: patches/patch-src_translators_freedb_util_cpp diff -N patches/patch-src_translators_freedb_util_cpp --- patches/patch-src_translators_freedb_util_cpp 9 Apr 2007 18:43:47 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,35 +0,0 @@ -$OpenBSD: patch-src_translators_freedb_util_cpp,v 1.1 2007/04/09 18:43:47 espie Exp $ ---- src/translators/freedb_util.cpp.orig Mon Apr 9 20:29:46 2007 -+++ src/translators/freedb_util.cpp Mon Apr 9 20:30:26 2007 -@@ -138,9 +138,7 @@ QValueList<uint> FreeDBImporter::offsetList(const QCSt - } - - cdrom_tochdr hdr; --#if defined(__OpenBSD__) || defined(__NetBSD__) -- ioc_read_toc_entry t; --#elif defined(__APPLE__) -+#if defined(__APPLE__) - dk_cd_read_disc_info_t discInfoParams; - ::memset(&discInfoParams, 0, sizeof(discInfoParams)); - discInfoParams.buffer = &hdr; -@@ -160,8 +158,10 @@ QValueList<uint> FreeDBImporter::offsetList(const QCSt - - cdrom_tocentry* TocEntry = new cdrom_tocentry[last+1]; - #if defined(__OpenBSD__) -+ ioc_read_toc_entry t; - t.starting_track = 0; - #elif defined(__NetBSD__) -+ ioc_read_toc_entry t; - t.starting_track = 1; - #endif - #if defined(__OpenBSD__) || defined(__NetBSD__) -@@ -169,7 +169,8 @@ QValueList<uint> FreeDBImporter::offsetList(const QCSt - t.data_len = (last + 1) * sizeof(cdrom_tocentry); - t.data = TocEntry; - -- ::ioctl(drive, CDIOREADTOCENTRYS, (char *) &t); -+ if (::ioctl(drive, CDIOREADTOCENTRYS, (char *) &t) < 0) -+ return list; - - #elif defined(__APPLE__) - dk_cd_read_track_info_t trackInfoParams; Index: patches/patch-src_translators_freedbimporter_cpp =================================================================== RCS file: patches/patch-src_translators_freedbimporter_cpp diff -N patches/patch-src_translators_freedbimporter_cpp --- patches/patch-src_translators_freedbimporter_cpp 9 Apr 2007 18:43:47 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_translators_freedbimporter_cpp,v 1.1 2007/04/09 18:43:47 espie Exp $ ---- src/translators/freedbimporter.cpp.orig Mon Apr 9 20:30:32 2007 -+++ src/translators/freedbimporter.cpp Mon Apr 9 20:30:59 2007 -@@ -517,6 +517,9 @@ QWidget* FreeDBImporter::widget(QWidget* parent_, cons - KConfigGroup config(KGlobal::config(), QString::fromLatin1("ImportOptions - FreeDB")); - QStringList devices = config.readListEntry("CD-ROM Devices"); - if(devices.isEmpty()) { -+#if defined(__OpenBSD__) -+ devices += QString::fromLatin1("/dev/rcd0c"); -+#endif - devices += QString::fromLatin1("/dev/cdrom"); - devices += QString::fromLatin1("/dev/dvd"); - } Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/tellico/pkg/PLIST,v retrieving revision 1.3 diff -u -u -r1.3 PLIST --- pkg/PLIST 16 Dec 2007 00:04:27 -0000 1.3 +++ pkg/PLIST 22 Jan 2008 10:08:19 -0000 @@ -1,4 +1,4 @@ [EMAIL PROTECTED] $OpenBSD: PLIST,v 1.3 2007/12/16 00:04:27 ajacoutot Exp $ [EMAIL PROTECTED] $OpenBSD: PLIST,v 1.2 2007/04/28 16:15:41 espie Exp $ bin/tellico share/applications/kde/tellico.desktop share/apps/kconf_update/tellico-rename.upd @@ -26,6 +26,7 @@ share/apps/tellico/entry-templates/Default.xsl share/apps/tellico/entry-templates/Fancy.xsl share/apps/tellico/entry-templates/Video.xsl +share/apps/tellico/gcstar2tellico.xsl share/apps/tellico/hddvd-logo.png share/apps/tellico/isbndb2tellico.xsl share/apps/tellico/mods2tellico.xsl @@ -95,6 +96,7 @@ share/apps/tellico/yahoo2tellico.xsl share/apps/tellico/z3950-servers.cfg share/config.kcfg/tellico_config.kcfg +share/config/tellicorc share/doc/HTML/en/tellico/ share/doc/HTML/en/tellico/advanced.docbook share/doc/HTML/en/tellico/amazon-options.png @@ -212,6 +214,7 @@ share/locale/ro/LC_MESSAGES/tellico.mo share/locale/ru/LC_MESSAGES/tellico.mo share/locale/sv/LC_MESSAGES/tellico.mo +share/locale/tr/LC_MESSAGES/tellico.mo share/mimelnk/application/x-tellico.desktop @exec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database Regards ahb
