4 files changed, 43 insertions, 19 deletions

diff --git a/audio/dvda-author/Makefile b/audio/dvda-author/Makefile
index 16cfa396ad99..c5b5bd62b5af 100644
--- a/audio/dvda-author/Makefile
+++ b/audio/dvda-author/Makefile
@@ -6,36 +6,40 @@
 #
 
 PORTNAME=	dvda-author
-PORTVERSION=	08.07
+PORTVERSION=	09.05
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	dvd-audio
-DISTNAME=	${PORTNAME}-core-${PORTVERSION}-2
+DISTNAME=	${PORTNAME}-${PORTVERSION}-7
 
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	Author and playback unencrypted and uncompressed Audio-DVDs
 
-LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac
+LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
+	ogg.5:${PORTSDIR}/audio/libogg \
+	sox.1:${PORTSDIR}/audio/sox \
+	samplerate.1:${PORTSDIR}/audio/libsamplerate \
+	png.5:${PORTSDIR}/graphics/png
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/libiberty.a:${PORTSDIR}/devel/gnulibiberty
 
 MAN1=		dvda-author.1
 
-LDFLAGS+=	-liberty
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/FLAC
 
+USE_AUTOTOOLS=  libltdl
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-flac=${LOCALBASE}/lib
-
-# yes, -1. I talked the author.
-WRKSRC=		${WRKDIR}/${PORTNAME}-core-${PORTVERSION}-1
-
-PLIST_FILES=	bin/dvda-author
-#		lib/libc_utils.a
-
-do-install:
-	${INSTALL} ${WRKSRC}/src/dvda ${PREFIX}/bin/dvda-author
-	${INSTALL} ${WRKSRC}/dvda-author.1 ${PREFIX}/man/man1
-
+CONFIGURE_ARGS=	--with-flac=${LOCALBASE}/lib/libFLAC.so \
+	--with-ogg=${LOCALBASE}/lib/libogg.so \
+	--enable-glibc
+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=        --docdir=${WRKDIR}/doc
+.endif
+CONFIGURE_ENV=  CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+ 
 .include <bsd.port.mk>
diff --git a/audio/dvda-author/distinfo b/audio/dvda-author/distinfo
index 97745b4e3de0..8b2c88a09581 100644
--- a/audio/dvda-author/distinfo
+++ b/audio/dvda-author/distinfo
@@ -1,3 +1,3 @@
-MD5 (dvda-author-core-08.07-2.tar.bz2) = 8094e20be8259b2579b8b916cf1ae6e8
-SHA256 (dvda-author-core-08.07-2.tar.bz2) = b48b8805525d7a4ad4f1e757431a0ca65d3ab46bf722d1f6ca1458bea266664c
-SIZE (dvda-author-core-08.07-2.tar.bz2) = 336985
+MD5 (dvda-author-09.05-7.tar.bz2) = 6579ad62ba37ebc6e9d75d3eb0e12dad
+SHA256 (dvda-author-09.05-7.tar.bz2) = 8988f44aa2777912078912a1e6415a895257d035878d1920a91f49b2f9543a69
+SIZE (dvda-author-09.05-7.tar.bz2) = 550898
diff --git a/audio/dvda-author/files/patch-configure b/audio/dvda-author/files/patch-configure
new file mode 100644
index 000000000000..9ed3881ff263
--- /dev/null
+++ b/audio/dvda-author/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig      2009-06-16 03:22:04.000000000 +0200
++++ configure   2009-06-16 03:22:17.000000000 +0200
+@@ -13402,7 +13402,7 @@
+      SOX_LIB="/usr/lib/libsox.a `echo /usr/lib/sox/libsox_*.a`"
+      { $as_echo "$as_me:$LINENO: SOX_LIB= $SOX_LIB" >&5
+ $as_echo "$as_me: SOX_LIB= $SOX_LIB" >&6;}
+-     SOX_LINK="$SOX_LINK -lasound -lpng -lz -lltdl -lmagic -lsamplerate"
++     SOX_LINK="$SOX_LINK -lpng -lz -lltdl -lmagic -lsamplerate"
+ 
+ fi
+ 
diff --git a/audio/dvda-author/pkg-plist b/audio/dvda-author/pkg-plist
new file mode 100644
index 000000000000..b82a44db01e1
--- /dev/null
+++ b/audio/dvda-author/pkg-plist
@@ -0,0 +1,9 @@
+bin/dvda-author
+share/applications/dvda-author.conf
+share/applications/dvda-author.desktop
+share/pixmaps/dvda-author.png
+@dirrmtry share/applications
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/dvda-author-09.05.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%