From owner-svn-ports-all@FreeBSD.ORG Tue Mar 19 09:39:43 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CCD3426C; Tue, 19 Mar 2013 09:39:43 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 911B1341; Tue, 19 Mar 2013 09:39:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2J9dhwT024415; Tue, 19 Mar 2013 09:39:43 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2J9dhrD024414; Tue, 19 Mar 2013 09:39:43 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201303190939.r2J9dhrD024414@svn.freebsd.org> From: Koop Mast Date: Tue, 19 Mar 2013 09:39:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314629 - head/math/gnumeric 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: Tue, 19 Mar 2013 09:39:43 -0000 Author: kwm Date: Tue Mar 19 09:39:43 2013 New Revision: 314629 URL: http://svnweb.freebsd.org/changeset/ports/314629 Log: Convert to OptionsNG. trim header, use USES=pathfix instead of gnomehack. Disable gnome option since it depends on libgsf_gnome which is deprecated. Modified: head/math/gnumeric/Makefile Modified: head/math/gnumeric/Makefile ============================================================================== --- head/math/gnumeric/Makefile Tue Mar 19 09:27:52 2013 (r314628) +++ head/math/gnumeric/Makefile Tue Mar 19 09:39:43 2013 (r314629) @@ -1,15 +1,11 @@ -# New ports collection makefile for: gnumeric -# Date created: 08 October 1998 -# Whom: Yukihiro Nakai -# +# Created by: Yukihiro Nakai # $FreeBSD$ # $MCom: ports-stable/math/gnumeric/Makefile,v 1.5 2010/06/29 11:24:22 kwm Exp $ -# # When updating, remember to update pkg-plist of gchemutils. PORTNAME= gnumeric PORTVERSION= 1.10.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,24 +17,23 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian -LIB_DEPENDS= goffice-0.8.8:${PORTSDIR}/devel/goffice \ - psiconv.10:${PORTSDIR}/converters/psiconv +LIB_DEPENDS= goffice-0.8:${PORTSDIR}/devel/goffice \ + psiconv:${PORTSDIR}/converters/psiconv RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_XZ= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomehier pygtk2 \ - desktopfileutils -WANT_GNOME= yes +USES= pathfix +USE_GNOME= gnomeprefix intlhack gnomehier pygtk2 \ + desktopfileutils libgsf USE_PYTHON= yes INSTALLS_OMF= yes USE_LDCONFIG= yes USE_CSTD= gnu89 -WANT_PERL= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gnome --disable-silent-rules +CONFIGURE_ARGS= --with-gnome=no --disable-silent-rules CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \ python_prog=${PYTHON_VERSION} CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} @@ -52,20 +47,13 @@ MAN1= gnumeric.1 ssconvert.1 ssindex.1 PLIST_SUB= VERSION=${PORTVERSION} GOFFICE=0.8.17 -OPTIONS= PERL "Enable Perl as extension language" on -#GNOMEDB "Enable libgnomedb support" off +OPTIONS_DEFINE= PERL +OPTIONS_DEFAULT=PERL +PERL_DESC= Support Perl as extension language -.include +.include -.if ${HAVE_GNOME:Mlibgnomeui}!="" -CONFIGURE_ARGS+=--with-gnome=yes -USE_GNOME+= libgnomeui libgsf_gnome -.else -CONFIGURE_ARGS+=--with-gnome=no -USE_GNOME+= libgsf -.endif - -.if defined(WITH_PERL) +.if ${PORT_OPTIONS:MPERL} USE_PERL5= yes PLIST_SUB+= PERL="" .else @@ -97,4 +85,4 @@ post-install: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${dir}/gnumeric .endfor -.include +.include