Index: head/audio/libgpod/Makefile
===================================================================
--- head/audio/libgpod/Makefile	(revision 402502)
+++ head/audio/libgpod/Makefile	(revision 402503)
@@ -1,74 +1,71 @@
 # Created by: Devon Ryan <dpryan@dpryan.com>
 # $FreeBSD$
 
 PORTNAME=	libgpod
 PORTVERSION=	0.8.3
-PORTREVISION=	4
+PORTREVISION=	5
 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 intltool
-USE_SQLITE=	3
-USES=		tar:bzip2 gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool localbase pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-udev --without-hal \
+CONFIGURE_ARGS=	--disable-silent-rules --disable-udev --without-hal \
 		--with-html-dir="${DOCSDIR:H}"
 USE_CSTD=	gnu89
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+USE_GNOME=	gdkpixbuf2 gtk20 intltool
+USE_SQLITE=	3
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 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,}
 .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}
+	${INSTALL_PROGRAM} ${WRKSRC}/tools/ipod-time-sync \
+		${STAGEDIR}${PREFIX}/bin
+
+post-install-MONO-off:
 	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libgpod-sharp.pc
-.endif
+
+post-install-DOCS-on:
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/audio/libgpod/pkg-plist
===================================================================
--- head/audio/libgpod/pkg-plist	(revision 402502)
+++ head/audio/libgpod/pkg-plist	(revision 402503)
@@ -1,57 +1,58 @@
 bin/ipod-read-sysinfo-extended
+bin/ipod-time-sync
 include/gpod-1.0/gpod/itdb.h
 lib/libgpod.a
 lib/libgpod.so
 lib/libgpod.so.4
 lib/libgpod.so.4.3.2
 %%MONO%%lib/libgpod/libgpod-sharp-test.exe
 %%MONO%%lib/libgpod/libgpod-sharp-test.exe.mdb
 %%MONO%%lib/libgpod/libgpod-sharp.dll
 %%MONO%%lib/libgpod/libgpod-sharp.dll.config
 %%MONO%%lib/libgpod/libgpod-sharp.dll.mdb
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/__init__.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/_gpod.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gpod.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gpod.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gpod.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gtkpod.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gtkpod.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/gtkpod.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.pyo
 libdata/pkgconfig/libgpod-1.0.pc
 %%MONO%%libdata/pkgconfig/libgpod-sharp.pc
 %%PORTDOCS%%%%DOCSDIR%%/ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/home.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/index.sgml
 %%PORTDOCS%%%%DOCSDIR%%/itunesdb.html
 %%PORTDOCS%%%%DOCSDIR%%/left.png
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-Artwork.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-Chapter-Data.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-Device.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-File-handling-functions.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-Low-level-functions.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-Photo-database.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-Playlists.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-Smart-Playlists.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-The-Itdb-iTunesDB-structure.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-Time-handling.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-Tracks.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod.devhelp2
 %%PORTDOCS%%%%DOCSDIR%%/photodb.html
 %%PORTDOCS%%%%DOCSDIR%%/right.png
 %%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/up.png
 share/locale/de/LC_MESSAGES/libgpod.mo
 share/locale/es/LC_MESSAGES/libgpod.mo
 share/locale/fr/LC_MESSAGES/libgpod.mo
 share/locale/he/LC_MESSAGES/libgpod.mo
 share/locale/it/LC_MESSAGES/libgpod.mo
 share/locale/ja/LC_MESSAGES/libgpod.mo
 share/locale/ro/LC_MESSAGES/libgpod.mo
 share/locale/sv/LC_MESSAGES/libgpod.mo
 share/locale/zh_CN/LC_MESSAGES/libgpod.mo