From tkato432@yahoo.com  Tue Sep 25 18:12:18 2012
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 53F7510656DE
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 25 Sep 2012 18:11:52 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa104lp.auone-net.jp (msa104lp.auone-net.jp [222.3.140.167])
	by mx1.freebsd.org (Postfix) with ESMTP id 1316A8FC16
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 25 Sep 2012 18:11:52 +0000 (UTC)
Received: from localhost.localdomain (ZT030063.ppp.dion.ne.jp [59.128.30.63])
	by msa104lp.auone-net.jp (au one net msa) with ESMTP id A9F7C2BC03C
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 26 Sep 2012 03:11:49 +0900 (JST)
Message-Id: <20120926022710.25b7430e4cebd1c9e1907456@yahoo.com>
Date: Wed, 26 Sep 2012 02:27:10 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: sysutils/unieject: Update to version 6

>Number:         172069
>Category:       ports
>Synopsis:       sysutils/unieject: Update to version 6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 25 18:20:22 UTC 2012
>Closed-Date:    Thu Nov 01 10:15:01 UTC 2012
>Last-Modified:  Thu Nov 01 10:15:01 UTC 2012
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 6

New file:
files/patch-lib__eject.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/sysutils/unieject/Makefile sysutils/unieject/Makefile
--- /usr/ports/sysutils/unieject/Makefile	2012-01-30 04:48:09.000000000 +0900
+++ sysutils/unieject/Makefile	2012-09-25 03:43:17.000000000 +0900
@@ -1,44 +1,41 @@
-# 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: ports/sysutils/unieject/Makefile,v 1.18 2012/01/29 19:48:09 pav Exp $
-#
 
 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 \
+		cdio:${PORTSDIR}/sysutils/libcdio
 
-USE_LDCONFIG=	yes
 USE_BZIP2=	yes
+USE_GNOME=	glib20 gnomehack
 USE_GETTEXT=	yes
 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 -urN /usr/ports/sysutils/unieject/distinfo sysutils/unieject/distinfo
--- /usr/ports/sysutils/unieject/distinfo	2011-03-19 21:33:31.000000000 +0900
+++ sysutils/unieject/distinfo	2012-09-11 05:12:47.000000000 +0900
@@ -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 -urN /usr/ports/sysutils/unieject/files/patch-lib__eject.c sysutils/unieject/files/patch-lib__eject.c
--- /usr/ports/sysutils/unieject/files/patch-lib__eject.c	1970-01-01 09:00:00.000000000 +0900
+++ sysutils/unieject/files/patch-lib__eject.c	2012-09-11 05:14:41.000000000 +0900
@@ -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 -urN /usr/ports/sysutils/unieject/pkg-plist sysutils/unieject/pkg-plist
--- /usr/ports/sysutils/unieject/pkg-plist	2006-10-20 05:57:50.000000000 +0900
+++ sysutils/unieject/pkg-plist	2012-09-11 05:30:03.000000000 +0900
@@ -5,15 +5,15 @@
 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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Sep 25 18:36:49 UTC 2012 
Responsible-Changed-Why:  
miwi@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172069 
Responsible-Changed-From-To: miwi->freebsd-ports-bugs 
Responsible-Changed-By: bapt 
Responsible-Changed-When: Mon Oct 29 09:42:42 UTC 2012 
Responsible-Changed-Why:  
Reassign to the heap miwi being overloaded for now 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172069 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Thu Nov 1 10:15:01 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172069 
>Unformatted:
