10 files changed, 130 insertions, 16 deletions

diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 24d9e66fda3a..3ef9b589e160 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	k3b
-PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTVERSION=	1.0.5
 CATEGORIES=	sysutils multimedia kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	A CD/DVD recording GUI for KDE
@@ -55,6 +53,10 @@ showinfo:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 700000
+PKGMESSAGE=	${PKGDIR}/pkg-message-7
+.endif
+
 .if defined(WITH_FLAC)
 PLIST_SUB+=	FLAC=""
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
diff --git a/sysutils/k3b-kde4/distinfo b/sysutils/k3b-kde4/distinfo
index 9af09efac8ad..600493bb3a8a 100644
--- a/sysutils/k3b-kde4/distinfo
+++ b/sysutils/k3b-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (k3b-1.0.4.tar.bz2) = 42538ddae0809707d3bcdbe0a6ed6a43
-SHA256 (k3b-1.0.4.tar.bz2) = 2b384127c330bf6c9ef5d08733b0da2d815aec66893a8fc628b746181f06d4bb
-SIZE (k3b-1.0.4.tar.bz2) = 5115790
+MD5 (k3b-1.0.5.tar.bz2) = e3b37d0d009af3dd149215d6ae0d54f3
+SHA256 (k3b-1.0.5.tar.bz2) = d4f9799f234ade98b7e417d1493de3bd4a44fd937e813c2beb29eba02cda50df
+SIZE (k3b-1.0.5.tar.bz2) = 5113060
diff --git a/sysutils/k3b-kde4/pkg-message b/sysutils/k3b-kde4/pkg-message
index 99b5309de70c..84a8736aec7e 100644
--- a/sysutils/k3b-kde4/pkg-message
+++ b/sysutils/k3b-kde4/pkg-message
@@ -1,4 +1,4 @@
-Notes for FreeBSD 5.x and onwards users:
+Notes for FreeBSD 5.x and 6.x users:
 1. The FreeBSD k3b port supports SCSI drives only. If you have IDE CD or DVD
    drives, use them through the cam system. See Chapter 12.5.9 of the handbook
    (http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/creating-cds.html#ATAPICAM)
diff --git a/sysutils/k3b-kde4/pkg-message-7 b/sysutils/k3b-kde4/pkg-message-7
new file mode 100644
index 000000000000..54ee2ac8f421
--- /dev/null
+++ b/sysutils/k3b-kde4/pkg-message-7
@@ -0,0 +1,53 @@
+Notes for FreeBSD 7.x and onwards users:
+1. The FreeBSD k3b port supports SCSI drives only. If you have IDE CD or DVD
+   drives, use them through the cam system. See Chapter 12.5.9 of the handbook
+   (http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/creating-cds.html#ATAPICAM)
+2. Your CD and DVD drives must have a mount point in /etc/fstab. They have
+   to be accessed through their atapicam device if possible. I.e. the drives
+   have to be adressed by e.g. /dev/cd0 instead of /dev/acd0.
+3. k3b has to be started from a root console, which is not recommended.
+   Alternatively do ALL of the following:
+3a. set the suid flag on cdrecord and cdrdao. The 'Notes' chapter of
+    'man cdrecord' discusses this.
+3b. - For every user who should be able to use k3b and for every CD or DVD
+      device add a directory in the users home directory. These directories
+      must be owned by the corresponding user. For each such directory add a
+      line in /etc/fstab (see remark 2), like:
+        /dev/cd0c  /usr/home/XXX/cdrom  cd9660  ro,noauto,nosuid  0  0
+      Furthermore allow user mounts as described in topic 9.22 of the FAQ:
+      http://www.freebsd.org/doc/en_US.ISO8859-1/books/faq/disks.html#USER-FLOPPYMOUNT
+      Every user must have read and write access to /dev/cdX:
+        * add to your /etc/devfs.rules under '[system=10]':
+            add path 'cd*' mode 666
+          or if you prefer allow access for a group XXX only add instead:
+            add path 'cd*' mode 660 group XXX
+        * to enable it, add to your /etc/rc.conf a
+            devfs_system_ruleset="system"
+    - or just give mount and umount the suid flag, which is a security leak.
+3c. Every user who should be able to use k3b must have read and write access
+    to all pass through devices connected with CD and DVD drives and to the 
+    /dev/xpt0 device. Run 'camcontrol devlist' to identify those devices (seek 
+    string 'passX' at the end of each line). Note, that this is a security 
+    leak as well but that there is no alternative! 
+        * add to your /etc/devfs.rules under '[system=10]':
+            add path 'pass*' mode 666
+            add path 'xpt0' mode 666
+          or if you prefer allow access for a group XXX only add instead:
+            add path 'pass*' mode 660 group XXX
+            add path 'xpt0' mode 660 group XXX
+        * to enable it, add to your /etc/rc.conf a
+            devfs_system_ruleset="system"
+        * to apply these changes without reboot, run as root:
+            /etc/rc.d/devfs restart
+4. Check, that DMA is activated for atapi devices: 'sysctl hw.ata.atapi_dma'
+   If not, set it to 1 and put a 'hw.ata.atapi_dma=1' into /boot/loader.conf.
+5. Create a directory on a partition, which has enough disk space to hold a CDs
+   or DVDs content (usually below /usr). Enter this directory in Settings->
+   Configure K3b...->Misc.
+6. If you experience problems while burning CDs, try to set the cdrdao driver 
+   manually. To do so choose Settings->Configure K3b...->Devices. Below the CD 
+   recorder click on the string "auto" behind "Cdrdao driver:" For most of the 
+   recent drives "generic-mmc" or "generic-mmc-raw" should work. 
+   See http://cdrdao.sourceforge.net/drives.html.
+
+To read this instructions again, type 'make showinfo' in the k3b port directory
diff --git a/sysutils/k3b-kde4/pkg-plist b/sysutils/k3b-kde4/pkg-plist
index fcd81f5d6f05..094d7cb5a9ca 100644
--- a/sysutils/k3b-kde4/pkg-plist
+++ b/sysutils/k3b-kde4/pkg-plist
@@ -19,6 +19,8 @@ include/k3bblankingjob.h
 include/k3bbootitem.h
 include/k3bbusywidget.h
 include/k3bcdcopyjob.h
+include/k3bcddb.h
+include/k3bcddbresult.h
 include/k3bcdparanoialib.h
 include/k3bcdrdaowriter.h
 include/k3bcdrecordwriter.h
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 24d9e66fda3a..3ef9b589e160 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	k3b
-PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTVERSION=	1.0.5
 CATEGORIES=	sysutils multimedia kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	A CD/DVD recording GUI for KDE
@@ -55,6 +53,10 @@ showinfo:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 700000
+PKGMESSAGE=	${PKGDIR}/pkg-message-7
+.endif
+
 .if defined(WITH_FLAC)
 PLIST_SUB+=	FLAC=""
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index 9af09efac8ad..600493bb3a8a 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,3 +1,3 @@
-MD5 (k3b-1.0.4.tar.bz2) = 42538ddae0809707d3bcdbe0a6ed6a43
-SHA256 (k3b-1.0.4.tar.bz2) = 2b384127c330bf6c9ef5d08733b0da2d815aec66893a8fc628b746181f06d4bb
-SIZE (k3b-1.0.4.tar.bz2) = 5115790
+MD5 (k3b-1.0.5.tar.bz2) = e3b37d0d009af3dd149215d6ae0d54f3
+SHA256 (k3b-1.0.5.tar.bz2) = d4f9799f234ade98b7e417d1493de3bd4a44fd937e813c2beb29eba02cda50df
+SIZE (k3b-1.0.5.tar.bz2) = 5113060
diff --git a/sysutils/k3b/pkg-message b/sysutils/k3b/pkg-message
index 99b5309de70c..84a8736aec7e 100644
--- a/sysutils/k3b/pkg-message
+++ b/sysutils/k3b/pkg-message
@@ -1,4 +1,4 @@
-Notes for FreeBSD 5.x and onwards users:
+Notes for FreeBSD 5.x and 6.x users:
 1. The FreeBSD k3b port supports SCSI drives only. If you have IDE CD or DVD
    drives, use them through the cam system. See Chapter 12.5.9 of the handbook
    (http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/creating-cds.html#ATAPICAM)
diff --git a/sysutils/k3b/pkg-message-7 b/sysutils/k3b/pkg-message-7
new file mode 100644
index 000000000000..54ee2ac8f421
--- /dev/null
+++ b/sysutils/k3b/pkg-message-7
@@ -0,0 +1,53 @@
+Notes for FreeBSD 7.x and onwards users:
+1. The FreeBSD k3b port supports SCSI drives only. If you have IDE CD or DVD
+   drives, use them through the cam system. See Chapter 12.5.9 of the handbook
+   (http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/creating-cds.html#ATAPICAM)
+2. Your CD and DVD drives must have a mount point in /etc/fstab. They have
+   to be accessed through their atapicam device if possible. I.e. the drives
+   have to be adressed by e.g. /dev/cd0 instead of /dev/acd0.
+3. k3b has to be started from a root console, which is not recommended.
+   Alternatively do ALL of the following:
+3a. set the suid flag on cdrecord and cdrdao. The 'Notes' chapter of
+    'man cdrecord' discusses this.
+3b. - For every user who should be able to use k3b and for every CD or DVD
+      device add a directory in the users home directory. These directories
+      must be owned by the corresponding user. For each such directory add a
+      line in /etc/fstab (see remark 2), like:
+        /dev/cd0c  /usr/home/XXX/cdrom  cd9660  ro,noauto,nosuid  0  0
+      Furthermore allow user mounts as described in topic 9.22 of the FAQ:
+      http://www.freebsd.org/doc/en_US.ISO8859-1/books/faq/disks.html#USER-FLOPPYMOUNT
+      Every user must have read and write access to /dev/cdX:
+        * add to your /etc/devfs.rules under '[system=10]':
+            add path 'cd*' mode 666
+          or if you prefer allow access for a group XXX only add instead:
+            add path 'cd*' mode 660 group XXX
+        * to enable it, add to your /etc/rc.conf a
+            devfs_system_ruleset="system"
+    - or just give mount and umount the suid flag, which is a security leak.
+3c. Every user who should be able to use k3b must have read and write access
+    to all pass through devices connected with CD and DVD drives and to the 
+    /dev/xpt0 device. Run 'camcontrol devlist' to identify those devices (seek 
+    string 'passX' at the end of each line). Note, that this is a security 
+    leak as well but that there is no alternative! 
+        * add to your /etc/devfs.rules under '[system=10]':
+            add path 'pass*' mode 666
+            add path 'xpt0' mode 666
+          or if you prefer allow access for a group XXX only add instead:
+            add path 'pass*' mode 660 group XXX
+            add path 'xpt0' mode 660 group XXX
+        * to enable it, add to your /etc/rc.conf a
+            devfs_system_ruleset="system"
+        * to apply these changes without reboot, run as root:
+            /etc/rc.d/devfs restart
+4. Check, that DMA is activated for atapi devices: 'sysctl hw.ata.atapi_dma'
+   If not, set it to 1 and put a 'hw.ata.atapi_dma=1' into /boot/loader.conf.
+5. Create a directory on a partition, which has enough disk space to hold a CDs
+   or DVDs content (usually below /usr). Enter this directory in Settings->
+   Configure K3b...->Misc.
+6. If you experience problems while burning CDs, try to set the cdrdao driver 
+   manually. To do so choose Settings->Configure K3b...->Devices. Below the CD 
+   recorder click on the string "auto" behind "Cdrdao driver:" For most of the 
+   recent drives "generic-mmc" or "generic-mmc-raw" should work. 
+   See http://cdrdao.sourceforge.net/drives.html.
+
+To read this instructions again, type 'make showinfo' in the k3b port directory
diff --git a/sysutils/k3b/pkg-plist b/sysutils/k3b/pkg-plist
index fcd81f5d6f05..094d7cb5a9ca 100644
--- a/sysutils/k3b/pkg-plist
+++ b/sysutils/k3b/pkg-plist
@@ -19,6 +19,8 @@ include/k3bblankingjob.h
 include/k3bbootitem.h
 include/k3bbusywidget.h
 include/k3bcdcopyjob.h
+include/k3bcddb.h
+include/k3bcddbresult.h
 include/k3bcdparanoialib.h
 include/k3bcdrdaowriter.h
 include/k3bcdrecordwriter.h