4 files changed, 48 insertions, 28 deletions

diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile
index a1015c2b60dd..1845d8db54aa 100644
--- a/sysutils/unieject/Makefile
+++ b/sysutils/unieject/Makefile
@@ -1,44 +1,44 @@
-# New ports collection makefile for:	unieject
-# Date created:		23 July 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	unieject
-DISTVERSION=	5.3.2
-PORTREVISION=	6
+PORTVERSION=	6
 CATEGORIES=	sysutils
-MASTER_SITES=	SF BERLIOS
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Eject(1) replacement
 
-LIB_DEPENDS=	cdio.13:${PORTSDIR}/sysutils/libcdio \
-		confuse.0:${PORTSDIR}/devel/libconfuse \
-		popt.0:${PORTSDIR}/devel/popt
+LICENSE=	GPLv2
 
-BROKEN=		does not link
+LIB_DEPENDS=	confuse:${PORTSDIR}/devel/libconfuse \
+		pcre:${PORTSDIR}/devel/pcre \
+		cdio:${PORTSDIR}/sysutils/libcdio
 
-USE_LDCONFIG=	yes
 USE_BZIP2=	yes
+USE_GNOME=	glib20 gnomehack
 USE_GETTEXT=	yes
+USE_ICONV=	yes
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
-MAN1=	unieject.1
-MAN5=	unieject.conf.5
+CONFIGURE_ARGS=	--disable-silent-rules \
+		--disable-doc
+USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lcdio -lconfuse
-CONFIGURE_ENV=	PKG_CONFIG="${TRUE}"
-CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE} \
-		--with-libpopt-prefix=${LOCALBASE}
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+MAN1=		unieject.1
+MAN5=		unieject.conf.5
 
 post-patch:
-	${REINPLACE_CMD} -e 's#if.*<<<$$DOXYFORMATS#if false#' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's#$$(libdir)/pkgconfig#${PREFIX}/libdata/pkgconfig#' ${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -Ee 's#install-htmlDATA (install-man)#\1#' ${WRKSRC}/manpages/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/-D_POSIX_C_SOURCE/s|^CPPFLAGS|#CPPFLAGS|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/^install-data-am:/s|install-dist_docDATA|| ; \
+		 /^install-data-am:/s|install-dist_htmlDATA||' ${WRKSRC}/Makefile.in
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/unieject.conf.sample ${PREFIX}/etc/
+	${INSTALL_DATA} ${WRKSRC}/unieject.conf.sample ${PREFIX}/etc
 
 .include <bsd.port.mk>
diff --git a/sysutils/unieject/distinfo b/sysutils/unieject/distinfo
index 22ec300bab64..b0cf3f130c22 100644
--- a/sysutils/unieject/distinfo
+++ b/sysutils/unieject/distinfo
@@ -1,2 +1,2 @@
-SHA256 (unieject-5.3.2.tar.bz2) = b32077ffd9e1af94a048afc55591b4ec43ca67fa720218d47f9120cd00105c51
-SIZE (unieject-5.3.2.tar.bz2) = 337274
+SHA256 (unieject-6.tar.bz2) = 1be7017d9132d05186051a6500331ed0330998f3818915e7e84a07e61fecd2ce
+SIZE (unieject-6.tar.bz2) = 370802
diff --git a/sysutils/unieject/files/patch-lib__eject.c b/sysutils/unieject/files/patch-lib__eject.c
new file mode 100644
index 000000000000..23f9b943ee8f
--- /dev/null
+++ b/sysutils/unieject/files/patch-lib__eject.c
@@ -0,0 +1,20 @@
+--- lib/eject.c.orig	2009-06-27 21:37:27.000000000 +0900
++++ lib/eject.c	2012-09-11 05:14:03.000000000 +0900
+@@ -110,7 +110,7 @@
+       sts = cdio_close_tray(opts->device, NULL);
+     }
+   } else
+-    sts = mmc_start_stop_media((CdIo_t*)opts->cdio, opts->eject, 0, 0);
++    sts = mmc_start_stop_unit((CdIo_t*)opts->cdio, opts->eject, 0, 0, 0);
+ #elif defined(__APPLE__)
+   driver_return_code_t sts;
+   if ( opts->eject )
+@@ -121,7 +121,7 @@
+     sts = cdio_close_tray(opts->device, NULL);
+   }
+ #else
+-  driver_return_code_t sts = mmc_start_stop_media((CdIo_t*)opts->cdio, opts->eject, 0, 0);
++  driver_return_code_t sts = mmc_start_stop_unit((CdIo_t*)opts->cdio, opts->eject, 0, 0, 0);
+ #endif
+ 	
+   return unieject_status(sts);
diff --git a/sysutils/unieject/pkg-plist b/sysutils/unieject/pkg-plist
index d15624b622df..cb4d1acee6f7 100644
--- a/sysutils/unieject/pkg-plist
+++ b/sysutils/unieject/pkg-plist
@@ -5,15 +5,15 @@ include/unieject/unieject.h
 lib/libunieject.a
 lib/libunieject.la
 lib/libunieject.so
-lib/libunieject.so.3
+lib/libunieject.so.5
 libdata/pkgconfig/libunieject.pc
 share/locale/de/LC_MESSAGES/unieject.mo
 share/locale/es_AR/LC_MESSAGES/unieject.mo
 share/locale/es_ES/LC_MESSAGES/unieject.mo
 share/locale/it/LC_MESSAGES/unieject.mo
 share/locale/nl/LC_MESSAGES/unieject.mo
-share/locale/pt_BR/LC_MESSAGES/unieject.mo
 share/locale/pt/LC_MESSAGES/unieject.mo
-@dirrm include/unieject
+share/locale/pt_BR/LC_MESSAGES/unieject.mo
 @dirrmtry share/locale/es_AR/LC_MESSAGES
 @dirrmtry share/locale/es_AR
+@dirrm include/unieject