On Fri, Oct 31, 2008 at 03:18:47PM +0100, Andreas Bihlmaier wrote: > On Fri, Oct 31, 2008 at 03:01:51PM +0100, Andreas Bihlmaier wrote: > > On Fri, Oct 31, 2008 at 01:24:50PM +0000, Stuart Henderson wrote: > > > On 2008/10/31 14:09, Andreas Bihlmaier wrote: > > > > + POPPLER_CFLAGS="-I/usr/local/include/poppler/qt3 > > > > -I/usr/local/include/poppler" \ > > > ^^^^^^^^^^ > > > ^^^^^^^^^^ > > > > + POPPLER_LIBS="-L/usr/local/lib -lpoppler-qt -lpoppler" \ > > > ^^^^^^^^^^ > > > > > > these should use a variable rather than be hardcoded.. I did manage to port exempi by disabling TLS (thread local storage), thus here is a new update to tellico including exempi.
Index: Makefile =================================================================== RCS file: /cvs/ports/x11/tellico/Makefile,v retrieving revision 1.7 diff -u -u -r1.7 Makefile --- Makefile 8 Feb 2008 15:30:54 -0000 1.7 +++ Makefile 31 Oct 2008 15:28:24 -0000 @@ -2,7 +2,7 @@ COMMENT= organizer for book/dvd/music collections -DISTNAME= tellico-1.2.14 +DISTNAME= tellico-1.3.4 CATEGORIES= x11 databases HOMEPAGE= http://www.periapsis.org/tellico/ @@ -16,9 +16,10 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB+= ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c crypto +WANTLIB+= ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c WANTLIB+= exslt gcrypt gpg-error iconv idn intl jpeg m pcre pcreposix -WANTLIB+= png pthread ssl stdc++ util xml2 xslt z fam rpcsvc +WANTLIB+= png pthread stdc++ util xml2 xslt z fam rpcsvc +WANTLIB+= expat fontconfig freetype MODULES= x11/kde \ lang/python @@ -30,6 +31,8 @@ CONFIGURE_ENV= ${MODKDE_CONFIGURE_ENV} CONFIGURE_ARGS= ${MODKDE_CONFIGURE_ARGS} \ ${CONFIGURE_SHARED} \ + POPPLER_CFLAGS="-I${LOCALBASE}/include/poppler/qt3 -I${LOCALBASE}/include/poppler" \ + POPPLER_LIBS="-L${LOCALBASE}/lib -lpoppler-qt -lpoppler" \ --disable-libsuffix \ --enable-final @@ -38,9 +41,11 @@ 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 \ - kcal,ktnef::x11/kde/pim3 \ + exempi::textproc/exempi \ + kcal,ktnef,kmime::x11/kde/pim3 \ kcddb::x11/kde/multimedia3 \ + kdecore.>=6,DCOP,kabc,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,knewstuff,kparts,kresources,kutils,kwalletclient,vcard::x11/kde/libs3 \ + poppler-qt.>=3,poppler::print/poppler,-qt \ tag::audio/taglib \ yaz::net/yaz Index: distinfo =================================================================== RCS file: /cvs/ports/x11/tellico/distinfo,v retrieving revision 1.2 diff -u -u -r1.2 distinfo --- distinfo 8 Feb 2008 15:30:54 -0000 1.2 +++ distinfo 31 Oct 2008 15:28:24 -0000 @@ -1,5 +1,5 @@ -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 +MD5 (tellico-1.3.4.tar.gz) = 1lMalzHMUMWc0liOevIv+A== +RMD160 (tellico-1.3.4.tar.gz) = I6KgHpvLSu4FJa7b6HNIAGoEXxE= +SHA1 (tellico-1.3.4.tar.gz) = De/IbFuI3ehJuPvTM4HzmPDKEac= +SHA256 (tellico-1.3.4.tar.gz) = cgoDq2cGhb3XemOy3LUIun5PMDe4AHbqQw/pFN7zeaA= +SIZE (tellico-1.3.4.tar.gz) = 5067461 Index: patches/patch-src_tests_Makefile_in =================================================================== RCS file: patches/patch-src_tests_Makefile_in diff -N patches/patch-src_tests_Makefile_in --- patches/patch-src_tests_Makefile_in 8 Feb 2008 15:30:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,89 +0,0 @@ -$OpenBSD: patch-src_tests_Makefile_in,v 1.1 2008/02/08 15:30:54 okan Exp $ ---- 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: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/tellico/pkg/PLIST,v retrieving revision 1.4 diff -u -u -r1.4 PLIST --- pkg/PLIST 8 Feb 2008 15:30:54 -0000 1.4 +++ pkg/PLIST 31 Oct 2008 15:28:24 -0000 @@ -1,6 +1,7 @@ @comment $OpenBSD: PLIST,v 1.4 2008/02/08 15:30:54 okan Exp $ -bin/tellico [EMAIL PROTECTED] bin/tellico share/applications/kde/tellico.desktop +share/apps/kconf_update/tellico-1-3-update.pl share/apps/kconf_update/tellico-rename.upd share/apps/kconf_update/tellico.upd share/apps/tellico/ @@ -8,17 +9,23 @@ share/apps/tellico/MARC21slimUtils.xsl share/apps/tellico/UNIMARC2MODS3.xsl share/apps/tellico/amazon2tellico.xsl +share/apps/tellico/arxiv2tellico.xsl share/apps/tellico/bibtex-translation.xml share/apps/tellico/bluray-logo.png share/apps/tellico/cassette-logo.png share/apps/tellico/cd-logo.png +share/apps/tellico/crossref2tellico.xsl share/apps/tellico/data-sources/ +share/apps/tellico/data-sources/boardgamegeek.rb +share/apps/tellico/data-sources/boardgamegeek.rb.spec share/apps/tellico/data-sources/dark_horse_comics.py share/apps/tellico/data-sources/dark_horse_comics.py.spec share/apps/tellico/data-sources/fr.allocine.py share/apps/tellico/data-sources/fr.allocine.py.spec share/apps/tellico/data-sources/ministerio_de_cultura.py share/apps/tellico/data-sources/ministerio_de_cultura.py.spec +share/apps/tellico/delicious2tellico.xsl +share/apps/tellico/discogs2tellico.xsl share/apps/tellico/dvd-logo.png share/apps/tellico/entry-templates/ share/apps/tellico/entry-templates/Album.xsl @@ -27,6 +34,7 @@ share/apps/tellico/entry-templates/Fancy.xsl share/apps/tellico/entry-templates/Video.xsl share/apps/tellico/gcstar2tellico.xsl +share/apps/tellico/griffith2tellico.py share/apps/tellico/hddvd-logo.png share/apps/tellico/isbndb2tellico.xsl share/apps/tellico/mods2tellico.xsl @@ -35,6 +43,7 @@ share/apps/tellico/pics/README.quesnay share/apps/tellico/pics/album.png share/apps/tellico/pics/bibtex.png +share/apps/tellico/pics/boardgame.png share/apps/tellico/pics/book.png share/apps/tellico/pics/card.png share/apps/tellico/pics/checkmark.png @@ -44,6 +53,7 @@ share/apps/tellico/pics/game.png share/apps/tellico/pics/nocover_album.png share/apps/tellico/pics/nocover_bibtex.png +share/apps/tellico/pics/nocover_boardgame.png share/apps/tellico/pics/nocover_book.png share/apps/tellico/pics/nocover_comic.png share/apps/tellico/pics/nocover_game.png @@ -72,6 +82,7 @@ share/apps/tellico/pics/wine.png share/apps/tellico/pubmed2tellico.xsl share/apps/tellico/record-logo.png +share/apps/tellico/referencer2tellico.xsl share/apps/tellico/report-templates/ share/apps/tellico/report-templates/Column_View.xsl share/apps/tellico/report-templates/Group_Summary.xsl @@ -88,16 +99,21 @@ share/apps/tellico/tellico-printing.xsl share/apps/tellico/tellico.dtd share/apps/tellico/tellico.tips +share/apps/tellico/tellico2gcstar.xsl share/apps/tellico/tellico2html.js share/apps/tellico/tellico2html.xsl share/apps/tellico/tellico2onix.xsl share/apps/tellico/tellicoui.rc +share/apps/tellico/unixref2tellico.xsl share/apps/tellico/vhs-logo.png +share/apps/tellico/welcome.html +share/apps/tellico/xmp2tellico.xsl 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/CMakeLists.txt share/doc/HTML/en/tellico/advanced.docbook share/doc/HTML/en/tellico/amazon-options.png share/doc/HTML/en/tellico/common @@ -140,6 +156,7 @@ share/doc/HTML/en/tellico/z3950-options.png share/doc/HTML/fr/ share/doc/HTML/fr/tellico/ +share/doc/HTML/fr/tellico/CMakeLists.txt share/doc/HTML/fr/tellico/advanced.docbook share/doc/HTML/fr/tellico/amazon-options.png share/doc/HTML/fr/tellico/common @@ -181,17 +198,17 @@ share/doc/HTML/fr/tellico/template-options.png share/doc/HTML/fr/tellico/z3950-options.png share/icons/hicolor/128x128/apps/tellico.png -share/icons/hicolor/128x128/mimetypes/tellico.png +share/icons/hicolor/128x128/mimetypes/application-x-tellico.png share/icons/hicolor/16x16/apps/tellico.png -share/icons/hicolor/16x16/mimetypes/tellico.png +share/icons/hicolor/16x16/mimetypes/application-x-tellico.png share/icons/hicolor/22x22/apps/tellico.png -share/icons/hicolor/22x22/mimetypes/tellico.png +share/icons/hicolor/22x22/mimetypes/application-x-tellico.png share/icons/hicolor/32x32/apps/tellico.png -share/icons/hicolor/32x32/mimetypes/tellico.png +share/icons/hicolor/32x32/mimetypes/application-x-tellico.png share/icons/hicolor/48x48/apps/tellico.png -share/icons/hicolor/48x48/mimetypes/tellico.png +share/icons/hicolor/48x48/mimetypes/application-x-tellico.png share/icons/hicolor/64x64/apps/tellico.png -share/icons/hicolor/64x64/mimetypes/tellico.png +share/icons/hicolor/64x64/mimetypes/application-x-tellico.png share/locale/bg/LC_MESSAGES/tellico.mo share/locale/ca/LC_MESSAGES/tellico.mo share/locale/cs/LC_MESSAGES/tellico.mo @@ -215,6 +232,10 @@ share/locale/ru/LC_MESSAGES/tellico.mo share/locale/sv/LC_MESSAGES/tellico.mo share/locale/tr/LC_MESSAGES/tellico.mo +share/locale/uk/LC_MESSAGES/tellico.mo +share/mime/ +share/mime/packages/ +share/mime/packages/tellico.xml share/mimelnk/application/x-tellico.desktop @exec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database Regards, ahb
