From owner-svn-ports-all@FreeBSD.ORG Sat Sep 8 13:32:27 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5F14106566B; Sat, 8 Sep 2012 13:32:27 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A75CB8FC0C; Sat, 8 Sep 2012 13:32:27 +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 q88DWR8Q092643; Sat, 8 Sep 2012 13:32:27 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q88DWRvX092641; Sat, 8 Sep 2012 13:32:27 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201209081332.q88DWRvX092641@svn.freebsd.org> From: Emanuel Haupt Date: Sat, 8 Sep 2012 13:32:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303901 - head/mail/sylpheed X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 08 Sep 2012 13:32:28 -0000 Author: ehaupt Date: Sat Sep 8 13:32:27 2012 New Revision: 303901 URL: http://svn.freebsd.org/changeset/ports/303901 Log: - Use OPTIONSng - Remove deprecated header information Modified: head/mail/sylpheed/Makefile Modified: head/mail/sylpheed/Makefile ============================================================================== --- head/mail/sylpheed/Makefile Sat Sep 8 13:09:10 2012 (r303900) +++ head/mail/sylpheed/Makefile Sat Sep 8 13:32:27 2012 (r303901) @@ -1,9 +1,4 @@ -# New ports collection makefile for: sylpheed -# Date created: 15 June 2000 -# Whom: shigeri -# # $FreeBSD$ -# PORTNAME= sylpheed PORTVERSION= 3.2.0 @@ -35,17 +30,19 @@ CONFIGURE_ARGS= --enable-ipv6 \ CONFLICTS= sylpheed-1.[0-8]* sylpheed-2.[0-9]* sylpheed-gtk2-[0-9]* -OPTIONS= GPGME "Enable GnuPG support using GPGME." off \ - COMPFACE "Enable X-Face support." off \ - JPILOT "Enable JPilot support." off \ - LDAP "Enable LDAP support." off \ - SSL "Enable OpenSSL support." on \ - GTKSPELL "Enable Spell checking support" on \ - ONIGURUMA "Enable Oniguruma support" off +OPTIONS_DEFINE= GPGME COMPFACE JPILOT LDAP SSL GTKSPELL ONIGURUMA -.include +GPGME_DESC= GnuPG support using GPGME +COMPFACE_DESC= X-Face support +JPILOT_DESC= JPilot support +GTKSPELL_DESC= Spell checking support +ONIGURUMA_DESC= Oniguruma support -.if !defined(WITHOUT_SSL) +OPTIONS_DEFAULT=SSL GTKSPELL + +.include + +.if ${PORT_OPTIONS:MSSL} # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk .include "${PORTSDIR}/Mk/bsd.openssl.mk" CONFIGURE_ARGS+=--enable-ssl @@ -53,7 +50,7 @@ CONFIGURE_ARGS+=--enable-ssl CONFIGURE_ARGS+=--disable-ssl .endif -.if defined(WITH_GPGME) +.if ${PORT_OPTIONS:MGPGME} LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg \ pinentry-gtk-2:${PORTSDIR}/security/pinentry-gtk2 @@ -62,14 +59,14 @@ CONFIGURE_ARGS+=--enable-gpgme CONFIGURE_ARGS+=--disable-gpgme .endif -.if defined(WITH_COMPFACE) +.if ${PORT_OPTIONS:MCOMPFACE} LIB_DEPENDS+= compface:${PORTSDIR}/mail/faces CONFIGURE_ARGS+=--enable-compface .else CONFIGURE_ARGS+=--disable-compface .endif -.if defined(WITH_JPILOT) +.if ${PORT_OPTIONS:MJPILOT} LIB_DEPENDS+= pisock:${PORTSDIR}/palm/pilot-link RUN_DEPENDS+= jpilot:${PORTSDIR}/palm/jpilot CONFIGURE_ARGS+=--enable-jpilot @@ -77,21 +74,21 @@ CONFIGURE_ARGS+=--enable-jpilot CONFIGURE_ARGS+=--disable-jpilot .endif -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+=--enable-ldap .else CONFIGURE_ARGS+=--disable-ldap .endif -.if defined(WITH_GTKSPELL) +.if ${PORT_OPTIONS:MGTKSPELL} LIB_DEPENDS+= gtkspell:${PORTSDIR}/textproc/gtkspell CONFIGURE_ARGS+=--enable-gtkspell .else CONFIGURE_ARGS+=--disable-gtkspell .endif -.if defined(WITH_ONIGURUMA) +.if ${PORT_OPTIONS:MONIGURUMA} BUILD_DEPENDS+= ${LOCALBASE}/lib/libonig.a:${PORTSDIR}/devel/oniguruma5 CONFIGURE_ARGS+=--enable-oniguruma .else @@ -140,4 +137,4 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${PREFIX}/share/pixmaps/ @${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${PREFIX}/share/applications/ -.include +.include