- update from Andreas Bihlmaier (MAINTAINER)
- Makefile re-work, use ${CONFIGURE_SHARED}
ok merdely@
This commit is contained in:
okan
parent
0bfbc05e03
commit
346d5e5a69
@ -1,47 +1,47 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2007/12/26 13:46:19 sturm Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2008/02/08 15:30:54 okan Exp $
|
||||
|
||||
COMMENT= organizer for book/dvd/music collections
|
||||
CATEGORIES= databases x11
|
||||
|
||||
DISTNAME= tellico-1.2.14
|
||||
CATEGORIES= x11 databases
|
||||
|
||||
HOMEPAGE= http://www.periapsis.org/tellico/
|
||||
MASTER_SITES= ${HOMEPAGE}download/
|
||||
DISTNAME= tellico-1.2.10
|
||||
PKGNAME= ${DISTNAME}p2
|
||||
|
||||
MAINTAINER= Andreas Bihlmaier <andreas.bihlmaier@gmx.de>
|
||||
MAINTAINER= Andreas Bihlmaier <andreas.bihlmaier@gmx.de>
|
||||
|
||||
MODULES= x11/kde
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
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 fam rpcsvc
|
||||
|
||||
MODULES= x11/kde \
|
||||
lang/python
|
||||
|
||||
USE_LIBTOOL= Yes
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS=${MODKDE_CONFIGURE_ARGS} \
|
||||
|
||||
CONFIGURE_ENV= ${MODKDE_CONFIGURE_ENV}
|
||||
CONFIGURE_ARGS= ${MODKDE_CONFIGURE_ARGS} \
|
||||
${CONFIGURE_SHARED} \
|
||||
--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
|
||||
MAKE_FLAGS= ${MODKDE_MAKE_FLAGS}
|
||||
|
||||
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 \
|
||||
kcddb::x11/kde/multimedia3 \
|
||||
tag::audio/taglib \
|
||||
yaz::net/yaz
|
||||
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
|
||||
|
||||
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
|
||||
|
||||
CONFIGURE_ENV=${MODKDE_CONFIGURE_ENV}
|
||||
MAKE_FLAGS=${MODKDE_MAKE_FLAGS}
|
||||
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 \
|
||||
kcddb::x11/kde/multimedia3 \
|
||||
tag::audio/taglib \
|
||||
yaz::net/yaz
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -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
|
||||
|
||||
89
x11/tellico/patches/patch-src_tests_Makefile_in
Normal file
89
x11/tellico/patches/patch-src_tests_Makefile_in
Normal file
@ -0,0 +1,89 @@
|
||||
$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@ @am__quote@./$(DEPDIR)/entitytest.Po@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/formattest.Po@am__quote@
|
||||
+#@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/formattest.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isbntest.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/latin1test.Po@am__quote@
|
||||
|
||||
@@ -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:
|
||||
@ -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;
|
||||
@ -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");
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2007/12/16 00:04:27 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.4 2008/02/08 15:30:54 okan Exp $
|
||||
bin/tellico
|
||||
share/applications/kde/tellico.desktop
|
||||
share/apps/kconf_update/tellico-rename.upd
|
||||
@ -26,6 +26,7 @@ share/apps/tellico/entry-templates/Compact.xsl
|
||||
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/vhs-logo.png
|
||||
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/pt_BR/LC_MESSAGES/tellico.mo
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user