mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00
Code Issues Releases Activity

- Update to version 2.9.5

Browse Source 
- Remove upstream applied patches
- Don't use Makefile.kde anymore
This commit is contained in:
Markus Brueffer 2004-06-06 15:58:43 +00:00
parent 1f3995892e
commit 4c1648eac3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=110949
9 changed files with 22 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
print/kover/Makefile
View File

@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= kover
PORTVERSION= 2.9.3
PORTREVISION= 2
PORTVERSION= 2.9.5
CATEGORIES= print kde
MASTER_SITES= http://lisas.de/kover/
@ -18,9 +17,11 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
post-extract:
@${TOUCH} -t 200404270000 ${WRKSRC}/Makefile.am.in
@${TOUCH} -t 200404270001 ${WRKSRC}/subdirs
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/x11/kde3/Makefile.kde"
.include <bsd.port.post.mk>
.include <bsd.port.mk>

4
print/kover/distinfo
View File

@ -1,2 +1,2 @@
MD5 (kover-2.9.3.tar.gz) = 41446036588bdbf90ac4d7d1a4e56667
SIZE (kover-2.9.3.tar.gz) = 612898
MD5 (kover-2.9.5.tar.gz) = 171df95d3f79f35764dd575c62e7276f
SIZE (kover-2.9.5.tar.gz) = 945767

114
print/kover/files/patch-cddb_fill.cc
View File

@ -1,114 +0,0 @@
--- kover/cddb_fill.cc.orig Mon Dec 29 03:32:23 2003
+++ kover/cddb_fill.cc Mon Dec 29 03:53:52 2003
@@ -67,6 +67,11 @@
#include "proxy_auth.h"
#include "categories.h"
+#ifdef __FreeBSD__
+#include <sys/cdio.h>
+#define CDROM_LEADOUT 0xAA
+#endif
+
extern "C" {
#ifdef HAVE_LINUX_CDROM_H
@@ -263,6 +268,10 @@
globals.cdrom_device = strdup("/dev/cdrom");
if ((cd_fd = open(globals.cdrom_device, O_RDONLY | O_NONBLOCK)) < 0) {
+#ifdef __FreeBSD__
+ emit statusText(QString(tr("Error while opening "))
+ + QString(globals.cdrom_device));
+#else
switch (errno) {
case EACCES:
emit statusText(QString(tr
@@ -281,9 +290,11 @@
emit statusText(QString(tr("Unknown error while opening "))
+ QString(globals.cdrom_device));
}
+#endif
return false;
}
+#ifndef __FreeBSD__
ds = ioctl(cd_fd, CDROM_DISC_STATUS);
switch (ds) {
@@ -300,6 +311,7 @@
return false;
}
_DEBUG_ fprintf(stderr, "CD opened: %d\n", ds);
+#endif
return true;
}
@@ -314,8 +326,13 @@
bool CDDB_Fill::readTOC()
{
+#ifdef __FreeBSD__
+ ioc_toc_header hdr;
+ ioc_read_toc_single_entry entry;
+#else
cdrom_tochdr hdr;
cdrom_tocentry entry;
+#endif
int i, pos;
_DEBUG_ fprintf(stderr, "Reading TOC\n");
@@ -327,7 +344,11 @@
emit statusText(tr("Reading table of contents..."));
+#ifdef __FreeBSD__
+ if (ioctl(cd_fd, CDIOREADTOCHEADER, &hdr) == -1) {
+#else
if (ioctl(cd_fd, CDROMREADTOCHDR, &hdr)) {
+#endif
emit statusText(tr("Error while reading table of contents!"));
return false;
@@ -336,24 +357,41 @@
cdinfo.artist = "Artist";
cdinfo.cdname = "Title";
cdinfo.length = 0;
+#ifdef __FreeBSD__
+ cdinfo.ntracks = hdr.ending_track;
+#else
cdinfo.ntracks = hdr.cdth_trk1;
-
+#endif
cdinfo.trk.clear();
for (i = 0; i <= cdinfo.ntracks; i++) {
if (i == cdinfo.ntracks)
+#ifdef __FreeBSD__
+ entry.track = CDROM_LEADOUT;
+ else
+ entry.track = i + 1;
+ entry.address_format = CD_MSF_FORMAT;
+ if (ioctl(cd_fd, CDIOREADTOCENTRY, &entry) == -1) {
+#else
entry.cdte_track = CDROM_LEADOUT;
else
entry.cdte_track = i + 1;
entry.cdte_format = CDROM_MSF;
if (ioctl(cd_fd, CDROMREADTOCENTRY, &entry)) {
+#endif
emit statusText(tr("Error while reading TOC entry!"));
return false;
}
+#ifdef __FreeBSD__
+ cdinfo.trk.append(new track_info(i + 1, entry.entry.addr.msf.minute,
+ entry.entry.addr.msf.second, entry.entry.addr.msf.frame));
+
+#else
cdinfo.trk.append(new track_info(i + 1, entry.cdte_addr.msf.minute,
entry.cdte_addr.msf.second, entry.cdte_addr.msf.frame));
+#endif
}
pos = cdinfo.trk.first()->length;

17
print/kover/files/patch-cdrom.cc
View File

@ -1,17 +0,0 @@
--- kover/cdrom.cc.orig Fri Feb 7 17:05:06 2003
+++ kover/cdrom.cc Mon Dec 29 04:51:51 2003
@@ -64,7 +64,14 @@
return -1;
}
if (cdrom_fd > 0)
+#ifdef __FreeBSD__
+ {
+ ioctl(cdrom_fd,CDIOCALLOW);
+ ioctl(cdrom_fd,CDIOCEJECT);
+ }
+#else
ioctl(cdrom_fd,CDROMEJECT);
+#endif
else
return -1;
close();

13
print/kover/files/patch-cdrom.h
View File

@ -1,13 +0,0 @@
--- kover/cdrom.h.orig Mon Dec 29 03:57:18 2003
+++ kover/cdrom.h Mon Dec 29 03:57:39 2003
@@ -41,6 +41,10 @@
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef __FreeBSD__
+#include <sys/cdio.h>
+#endif
+
#ifdef HAVE_LINUX_CDROM_H
#include <linux/cdrom.h>
#endif

91
print/kover/files/patch-cdrom_cddb.cc
View File

@ -1,91 +0,0 @@
--- kover/cdrom_cddb.cc.orig Mon Dec 29 04:01:52 2003
+++ kover/cdrom_cddb.cc Mon Dec 29 04:08:20 2003
@@ -31,6 +31,11 @@
#include "cdrom_cddb.h"
#include <stdio.h>
+#ifdef __FreeBSD__
+#include <sys/cdio.h>
+#define CDROM_LEADOUT 0xAA
+#endif
+
cdrom_cddb::cdrom_cddb(char *path):cdrom(path)
{
open();
@@ -49,8 +54,13 @@
void cdrom_cddb::calc_cddb_id()
{
+#ifdef __FreeBSD__
+ ioc_toc_header hdr;
+ ioc_read_toc_single_entry entry;
+#else
cdrom_tochdr hdr;
cdrom_tocentry entry;
+#endif
int i = 0;
int pos = 0;
int length = 0;
@@ -62,13 +72,28 @@
exit(0);
}
+#ifdef __FreeBSD__
+ if (ioctl(cdrom_fd, CDIOREADTOCHEADER, &hdr) == -1) {
+#else
if (ioctl(cdrom_fd, CDROMREADTOCHDR, &hdr)) {
+#endif
fprintf(stderr,
"%s:error while reading table of contents. exiting now!\n",
PACKAGE);
exit(0);
}
+#ifdef __FreeBSD__
+ i = ntracks = hdr.ending_track;
+
+ do {
+ if (i == ntracks)
+ entry.track = CDROM_LEADOUT;
+ else
+ entry.track = i + 1;
+ entry.address_format = CD_MSF_FORMAT;
+ if (ioctl(cdrom_fd, CDIOREADTOCENTRY, &entry)) {
+#else
i = ntracks = hdr.cdth_trk1;
do {
@@ -78,12 +103,25 @@
entry.cdte_track = i + 1;
entry.cdte_format = CDROM_MSF;
if (ioctl(cdrom_fd, CDROMREADTOCENTRY, &entry)) {
+#endif
fprintf(stderr,
"%s:error while reading toc entry. exiting now!\n", PACKAGE);
exit(0);
}
if (i != ntracks)
pos +=
+#ifdef __FreeBSD__
+ cddb_sum((entry.entry.addr.msf.minute * 60) +
+ entry.entry.addr.msf.second);
+ if (i == 0)
+ length =
+ length - ((entry.entry.addr.msf.minute * 60) +
+ entry.entry.addr.msf.second);
+ if (i == ntracks)
+ length =
+ (entry.entry.addr.msf.minute * 60) +
+ entry.entry.addr.msf.second;
+#else
cddb_sum((entry.cdte_addr.msf.minute * 60) +
entry.cdte_addr.msf.second);
if (i == 0)
@@ -94,6 +132,7 @@
length =
(entry.cdte_addr.msf.minute * 60) +
entry.cdte_addr.msf.second;
+#endif
} while (i--);

11
print/kover/files/patch-directory.cc Normal file
View File

@ -0,0 +1,11 @@
--- kover/directory.cc.orig Sun Jun 6 16:25:27 2004
+++ kover/directory.cc Sun Jun 6 16:36:15 2004
@@ -153,7 +153,7 @@
for (dir = childs.begin(); dir != childs.end(); dir++) {
printf("%s:%s:%d\n",(*dir)->get_current().c_str(),
path.c_str(),path.size());
- if (!(*dir)->get_current().compare(0,path.size(),path))
+ if (!(*dir)->get_current().compare(path))
return (*dir);
}
return this;

12
print/kover/files/patch-net.cc
View File

@ -1,12 +0,0 @@
--- kover/net.cc.orig Mon Dec 29 04:55:16 2003
+++ kover/net.cc Mon Dec 29 05:01:10 2003
@@ -33,6 +33,9 @@
#include "kover.h"
#include <netdb.h>
+#ifdef __FreeBSD__
+#include <sys/param.h>
+#endif
#include <netinet/in.h>
#include <sys/socket.h>
#include <unistd.h>

18
print/kover/pkg-plist
View File

@ -8,6 +8,7 @@ share/apps/kover/pics/front_title-content-right_content-left.png
share/apps/kover/pics/front_title-right_content-left.png
share/apps/kover/pics/front_title_only.png
share/apps/kover/pics/one_page.png
share/icons/hicolor/16x16/apps/audio_mode.png
share/icons/hicolor/32x32/apps/kover.png
share/icons/hicolor/48x48/apps/kover.png
share/icons/locolor/16x16/apps/kover.png
@ -22,21 +23,6 @@ share/locale/pl/LC_MESSAGES/kover.mo
share/mimelnk/application/x-kover.desktop
@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
@unexec rmdir %D/share/mimelnk 2>/dev/null || true
@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/pl 2>/dev/null || true
@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/no 2>/dev/null || true
@unexec rmdir %D/share/locale/nb/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/nb 2>/dev/null || true
@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/it 2>/dev/null || true
@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/fr 2>/dev/null || true
@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/es 2>/dev/null || true
@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/de 2>/dev/null || true
@unexec rmdir %D/share/locale 2>/dev/null || true
@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
@ -46,6 +32,8 @@ share/mimelnk/application/x-kover.desktop
@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
@unexec rmdir %D/share/icons 2>/dev/null || true
@dirrm share/apps/kover/pics