From owner-svn-ports-all@FreeBSD.ORG Thu Nov 1 10:14:38 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1F46FE68; Thu, 1 Nov 2012 10:14:38 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F06418FC14; Thu, 1 Nov 2012 10:14:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA1AEbpR067448; Thu, 1 Nov 2012 10:14:37 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA1AEbqL067443; Thu, 1 Nov 2012 10:14:37 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201211011014.qA1AEbqL067443@svn.freebsd.org> From: Pawel Pekala Date: Thu, 1 Nov 2012 10:14:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306790 - in head/sysutils/unieject: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2012 10:14:38 -0000 Author: pawel Date: Thu Nov 1 10:14:37 2012 New Revision: 306790 URL: http://svn.freebsd.org/changeset/ports/306790 Log: - Unbreak and update to version 6 - Add LICENSE PR: ports/172069 Submitted by: KATO Tsuguru Feature safe: yes Added: head/sysutils/unieject/files/ head/sysutils/unieject/files/patch-lib__eject.c (contents, props changed) Modified: head/sysutils/unieject/Makefile head/sysutils/unieject/distinfo head/sysutils/unieject/pkg-plist Modified: head/sysutils/unieject/Makefile ============================================================================== --- head/sysutils/unieject/Makefile Thu Nov 1 10:10:32 2012 (r306789) +++ head/sysutils/unieject/Makefile Thu Nov 1 10:14:37 2012 (r306790) @@ -1,44 +1,44 @@ -# New ports collection makefile for: unieject -# Date created: 23 July 2006 -# Whom: Andrew Pantyukhin -# +# Created by: Andrew Pantyukhin # $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 Modified: head/sysutils/unieject/distinfo ============================================================================== --- head/sysutils/unieject/distinfo Thu Nov 1 10:10:32 2012 (r306789) +++ head/sysutils/unieject/distinfo Thu Nov 1 10:14:37 2012 (r306790) @@ -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 Added: head/sysutils/unieject/files/patch-lib__eject.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/unieject/files/patch-lib__eject.c Thu Nov 1 10:14:37 2012 (r306790) @@ -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); Modified: head/sysutils/unieject/pkg-plist ============================================================================== --- head/sysutils/unieject/pkg-plist Thu Nov 1 10:10:32 2012 (r306789) +++ head/sysutils/unieject/pkg-plist Thu Nov 1 10:14:37 2012 (r306790) @@ -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