5 files changed, 43 insertions, 15 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 0145dfe7eba7..d578993ec379 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -10,17 +10,17 @@
 # If You don't want to use pthreads, set DONT_USE_PTHREADS = yes
 # If You want the graphical X toc file editor, set XCDRDAO = yes
 
-DISTNAME=		cdrdao-1.1.2.src
-PKGNAME=		cdrdao-1.1.2
+DISTNAME=		cdrdao-1.1.3.src
+PKGNAME=		cdrdao-1.1.3
 CATEGORIES=		audio
 MASTER_SITES=		http://www.ping.de/sites/daneb/
 
-MAINTAINER=		futatuki@fureai.or.jp
+MAINTAINER=		futatuki@debug.gr.jp
 
 BUILD_DEPENDS=		antlr:${PORTSDIR}/devel/pccts\
 			dlg:${PORTSDIR}/devel/pccts
 
-WRKSRC=         	${WRKDIR}/cdrdao-1.1.2
+WRKSRC=         	${WRKDIR}/cdrdao-1.1.3
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -39,14 +39,12 @@ XCDRDAO=		yes
 .if defined(XCDRDAO)
 USE_NEWGCC=	yes
 LIB_DEPENDS+=		gtkmm-1.0.7:${PORTSDIR}/x11-toolkits/gtk--
+MAN1+=		xcdrdao.1
+PLIST=${PKGDIR}/PLIST.xcdrdao
 .else
 CONFIGURE_ARGS= 	--disable-gtkmmtest
 .endif
 
-.if defined(USE_NEWGCC) && ${USE_NEWGCC} == yes && ${OSVERSION} < 400004
-CFLAGS+=		-fpermissive
-.endif
-
 .if defined(DONT_USE_SCGLIB) && ${OSVERSION} > 300000
 CONFIGURE_ARGS+= 	--without-scglib
 .endif
@@ -75,7 +73,8 @@ post-install:
 	strip $(PREFIX)/bin/xcdrdao
 .endif
 	@${MKDIR} ${PREFIX}/share/doc/cdrdao
-.for i in COPYING INSTALL README README.FreeBSD README.PlexDAE
+.for i in COPYING CREDITS INSTALL README README.FreeBSD README.PlexDAE \
+	Release-1.1.0 Release-1.1.2 Release-1.1.3
 	@${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/cdrdao/
 .endfor
 	@${CAT} ${PKGDIR}/MESSAGE
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index e5575fdbc466..f31823b2f68d 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1 +1 @@
-MD5 (cdrdao-1.1.2.src.tar.gz) = 9ba656894cb24d05502943e7e804cd3e
+MD5 (cdrdao-1.1.3.src.tar.gz) = 9a6bfcc70fda8a6a4aee693a6a407b8e
diff --git a/sysutils/cdrdao/files/patch-ac b/sysutils/cdrdao/files/patch-ac
new file mode 100644
index 000000000000..40d2dea2e860
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-ac
@@ -0,0 +1,28 @@
+--- configure.orig	Wed Oct 27 01:13:45 1999
++++ configure	Wed Oct 27 03:29:33 1999
+@@ -2945,7 +2945,7 @@
+ esac
+ 
+ case "$host" in
+-  *-linux-*)
++  *-linux-* | *-freebsd*)
+ 	     sound_if_src=SoundIF-linux.cc
+ 	     ;;
+ 
+--- xdao/SoundIF-linux.cc.orig	Wed Oct 27 01:13:46 1999
++++ xdao/SoundIF-linux.cc	Wed Oct 27 03:37:23 1999
+@@ -31,7 +31,14 @@
+  *
+  */
+ 
++# if defined(__FreeBSD__)
++#include <machine/soundcard.h>
++# if !defined(SNDCTL_DSP_CHANNELS)
++#   define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO
++# endif
++# else 
+ #include <linux/soundcard.h>
++# endif
+ 
+ #include <stdio.h>
+ #include <assert.h>
diff --git a/sysutils/cdrdao/pkg-message b/sysutils/cdrdao/pkg-message
index 5656ed652f6d..2f212abc2f2d 100644
--- a/sysutils/cdrdao/pkg-message
+++ b/sysutils/cdrdao/pkg-message
@@ -1,11 +1,9 @@
 Note:
- * Be sure your kernel is built with "options SYSVMSG" and "options SYSVSHM".
-   Cdrdao requires kernel with these options. 
- * Also, you must include 
+ * If you want to use POSIX schedule mechanism, you must include 
     
         options             "P1003_1B"
         options             "_KPOSIX_PRIORITY_SCHEDULING"
         options             "_KPOSIX_VERSION=199309L"
 
    in your kernel configuration. These options are required by POSIX thread
-   control functions. 
+   control functions.
diff --git a/sysutils/cdrdao/pkg-plist b/sysutils/cdrdao/pkg-plist
index e717bbc33809..67cead0ab33c 100644
--- a/sysutils/cdrdao/pkg-plist
+++ b/sysutils/cdrdao/pkg-plist
@@ -1,8 +1,11 @@
 bin/cdrdao
-bin/xcdrdao
 share/doc/cdrdao/COPYING 
+share/doc/cdrdao/CREDITS
 share/doc/cdrdao/INSTALL 
 share/doc/cdrdao/README 
 share/doc/cdrdao/README.FreeBSD 
 share/doc/cdrdao/README.PlexDAE 
+share/doc/cdrdao/Release-1.1.0
+share/doc/cdrdao/Release-1.1.2
+share/doc/cdrdao/Release-1.1.3
 @dirrm share/doc/cdrdao