Index: head/audio/libgpod/Makefile
===================================================================
--- head/audio/libgpod/Makefile	(revision 389224)
+++ head/audio/libgpod/Makefile	(revision 389225)
@@ -1,67 +1,74 @@
 # Created by: Devon Ryan <dpryan@dpryan.com>
 # $FreeBSD$
 
 PORTNAME=	libgpod
 PORTVERSION=	0.8.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF/gtkpod/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Library for direct access to iPod contents
 
 LICENSE=	LGPL20
 
 LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist \
 		libtag.so:${PORTSDIR}/audio/taglib \
 		libsgutils2.so:${PORTSDIR}/sysutils/sg3_utils
 
 USE_GNOME=	gdkpixbuf2 gtk20
 USE_SQLITE=	3
 USES=		tar:bzip2 gettext gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-udev --without-hal \
 		--with-html-dir="${DOCSDIR:H}"
 USE_CSTD=	gnu89
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOCS IMOBILE MONO PYTHON
+OPTIONS_DEFINE=	DOCS IMOBILE PYTHON # MONO
 OPTIONS_DEFAULT=IMOBILE
 OPTIONS_SUB=	yes
 
 IMOBILE_DESC=	Apple iPhone/iPod Touch support
 
+IMOBILE_LIB_DEPENDS=	libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice
+IMOBILE_CONFIGURE_ENV=	LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
+IMOBILE_CONFIGURE_WITH=	libimobiledevice
+
+# Mono 4+ doesn't seem to be supported.
 MONO_USE=		GNOME=gtksharp20
 MONO_CONFIGURE_WITH=	mono
+CONFIGURE_ARGS+=	--without-mono
+PLIST_SUB+=		MONO="@comment "
 
 PYTHON_BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20 \
 			${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
 PYTHON_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
 PYTHON_USE=		GNOME=pygobject
 PYTHON_USES=		python
 PYTHON_CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig2.0"
 PYTHON_CONFIGURE_WITH=	python
 
 PORTDOCS=	ChangeLog NEWS README*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMOBILE}
 COMMENT:=	${COMMENT:S,iPod,&/iPhone,}
-LIB_DEPENDS+=	libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice
-CONFIGURE_ENV+=	LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
-.else
-CONFIGURE_ARGS+=--without-libimobiledevice
 .endif
 
 post-patch:
 # Allow to build tools without HAL
 	@${REINPLACE_CMD} -e '/noinst_PROGRAMS =/ s,^,@HAVE_HAL_TRUE@,' \
 		${WRKSRC}/tools/Makefile.in
 
 post-install:
+.if ! ${PORT_OPTIONS:MMONO}
+	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libgpod-sharp.pc
+.endif
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/audio/libgpod/pkg-descr
===================================================================
--- head/audio/libgpod/pkg-descr	(revision 389224)
+++ head/audio/libgpod/pkg-descr	(revision 389225)
@@ -1,14 +1,14 @@
 libgpod is a shared library to access the contents of an iPod and
 optionally iPhone (via `comms/libimobiledevice' library port, enabled
 by default).
 
 This code was originally part of gtkpod itself. When the parsing code
 was made self-contained with gtkpod v0.93, decision was made to put
 this code in a separate library so that other projects can benefit
 from it without duplicating code.
 
 libgpod supports playlists, smart playlists, playcounts, ratings,
 podcasts, cover art, audio and video. Photo support is implemented as
 well. Python and Mono bindings are optionally available too.
 
-WWW: http://www.gtkpod.org/libgpod.html
+WWW: http://www.gtkpod.org/wiki/Libgpod