diff -urN /usr/ports/multimedia/gmerlin-avdecoder/Makefile multimedia/gmerlin-avdecoder/Makefile
--- /usr/ports/multimedia/gmerlin-avdecoder/Makefile	2011-06-25 14:16:14.000000000 +0900
+++ multimedia/gmerlin-avdecoder/Makefile	2011-06-29 02:17:41.000000000 +0900
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmerlin-avdecoder
-PORTVERSION=	1.0.1
-PORTREVISION=	13
+PORTVERSION=	1.1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/gmerlin/${PORTNAME}/${PORTVERSION}
 
@@ -16,16 +15,6 @@
 
 LIB_DEPENDS=	gavl.1:${PORTSDIR}/multimedia/gavl
 
-GNU_CONFIGURE=	yes
-USE_GETTEXT=	yes
-CONFIGURE_ARGS=	--without-cpuflags --without-doxygen
-USE_GNOME=	gnomehack pkgconfig
-USE_LDCONFIG=	yes
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-
-PORTDOCS=	README
-
 OPTIONS=	GMERLIN	"Enable gmerlin support" on \
 		FFMPEG	"Enable ffmpeg support" on \
 		THEORA	"Enable theora support" on \
@@ -43,17 +32,22 @@
 		MAD	"Enable mp3 support" on \
 		A52	"Enable A52 support" on \
 		DCA	"Enable DTS Coherent Acoustics decoder" on \
-		LIBCDIO	"Enable libcdio support" on \
+		CDIO	"Enable libcdio support" on \
 		OPENJPEG "Enable JPEG2000 support" on \
 		SCHROEDINGER "Enable dirac support" on \
 		OPTIMIZED_CFLAGS "Additional optimizations" on
 
-.include <bsd.port.pre.mk>
+USE_GNOME=	gnomehack pkgconfig
+USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--without-cpuflags --without-doxygen
+USE_LDCONFIG=	yes
 
-# Hack for 6.x to properly detect ffmpeg
-.if ${OSVERSION} < 700000
-CONFIGURE_ENV+=	AVCODEC_LIBS="`pkg-config --libs libavcodec` ${PTHREAD_LIBS}"
-.endif
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GMERLIN)
 LIB_DEPENDS+=	gmerlin.0:${PORTSDIR}/multimedia/gmerlin
@@ -72,7 +66,7 @@
 .if !defined(WITHOUT_THEORA)
 LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
 .else
-CONFIGURE_ARGS+=--disable-theora
+CONFIGURE_ARGS+=--disable-theoradec
 .endif
 
 .if !defined(WITHOUT_SPEEX)
@@ -94,12 +88,6 @@
 CONFIGURE_ARGS+=--disable-vorbis
 .endif
 
-.if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
-.else
-CONFIGURE_ARGS+=--disable-vorbis
-.endif
-
 .if !defined(WITHOUT_MPEG2)
 LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
 .else
@@ -169,12 +157,12 @@
 CONFIGURE_ARGS+=--disable-libcda --disable-libdca
 .endif
 
-.if !defined(WITHOUT_LIBCDIO)
+.if !defined(WITHOUT_CDIO)
 LIB_DEPENDS+=	cdio.12:${PORTSDIR}/sysutils/libcdio
-PLIST_SUB+=	LIBCDIO=""
+PLIST_SUB+=	CDIO=""
 .else
 CONFIGURE_ARGS+=--disable-libcdio
-PLIST_SUB+=	LIBCDIO="@comment "
+PLIST_SUB+=	CDIO="@comment "
 .endif
 
 .if !defined(WITHOUT_OPENJPEG)
@@ -196,20 +184,20 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O3 -funroll-all-loops -ffast-math||g; \
-		/LIBS/ s|-ldl||g; s|^LDFLAGS="|&$${LDFLAGS} |' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|#if DVDREAD_VERSION < 905|#if DVDREAD_VERSION < 904|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/^LIBS = / s|$$| @LIBINTL@ -lz|' \
-		${WRKSRC}/tests/Makefile.in
-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/in_smb.c
-	@${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
-		${WRKSRC}/lib/pngreader.c
+	@${REINPLACE_CMD} -e \
+		's|-O3 -funroll-all-loops -ffast-math||g; \
+		 /LIBS/ s|-ldl||g; \
+		 s|^LDFLAGS="|&$${LDFLAGS} |' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|#if DVDREAD_VERSION < 905|#if DVDREAD_VERSION < 904|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/^LIBS = / s|$$| @LIBINTL@ -lz|' ${WRKSRC}/tests/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|malloc.h|stdlib.h|' ${WRKSRC}/lib/in_smb.c
 
-.if !defined(NOPORTDOCS)
 post-install:
-	${MKDIR} ${DOCSDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
diff -urN /usr/ports/multimedia/gmerlin-avdecoder/distinfo multimedia/gmerlin-avdecoder/distinfo
--- /usr/ports/multimedia/gmerlin-avdecoder/distinfo	2009-08-12 16:04:48.000000000 +0900
+++ multimedia/gmerlin-avdecoder/distinfo	2011-06-28 01:05:15.000000000 +0900
@@ -1,3 +1,2 @@
-MD5 (gmerlin-avdecoder-1.0.1.tar.gz) = 1ae5911a3d90d7afa773e949a1168f31
-SHA256 (gmerlin-avdecoder-1.0.1.tar.gz) = 97f127b1e8bf3e54f61f744f7cbd983d2cb28cb9ce3f149c2b92851ec30929d2
-SIZE (gmerlin-avdecoder-1.0.1.tar.gz) = 1393783
+SHA256 (gmerlin-avdecoder-1.1.0.tar.gz) = b0a9efcf152321d8829d2023660c8d14fdde894dc8881bdd67269c4f4cb4cc35
+SIZE (gmerlin-avdecoder-1.1.0.tar.gz) = 1472068
diff -urN /usr/ports/multimedia/gmerlin-avdecoder/pkg-plist multimedia/gmerlin-avdecoder/pkg-plist
--- /usr/ports/multimedia/gmerlin-avdecoder/pkg-plist	2009-08-12 16:04:48.000000000 +0900
+++ multimedia/gmerlin-avdecoder/pkg-plist	2011-06-29 03:39:19.000000000 +0900
@@ -1,16 +1,21 @@
+bin/bgavavdemux
 bin/bgavdump
 include/gmerlin/avdec.h
 include/gmerlin/bgavdefs.h
 include/gmerlin/bgav_version.h
 %%GMERLIN%%lib/gmerlin/plugins/i_avdec.la
 %%GMERLIN%%lib/gmerlin/plugins/i_avdec.so
-%%LIBCDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.la
-%%LIBCDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.so
-%%LIBCDIO%%lib/gmerlin/plugins/i_vcd.la
-%%LIBCDIO%%lib/gmerlin/plugins/i_vcd.so
+lib/gmerlin/plugins/i_dvb.la
+lib/gmerlin/plugins/i_dvb.so
+%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.la
+%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.so
+%%CDIO%%lib/gmerlin/plugins/i_vcd.la
+%%CDIO%%lib/gmerlin/plugins/i_vcd.so
 lib/libgmerlin_avdec.la
 lib/libgmerlin_avdec.so
 lib/libgmerlin_avdec.so.1
 libdata/pkgconfig/gmerlin_avdec.pc
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/locale/de/LC_MESSAGES/gmerlin-avdecoder.mo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry include/gmerlin