From owner-svn-ports-head@FreeBSD.ORG Fri Jul 25 08:32:28 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DED0D50D; Fri, 25 Jul 2014 08:32:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CBAB22423; Fri, 25 Jul 2014 08:32:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6P8WRUB010327; Fri, 25 Jul 2014 08:32:27 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6P8WRqT010326; Fri, 25 Jul 2014 08:32:27 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201407250832.s6P8WRqT010326@svn.freebsd.org> From: Pawel Pekala Date: Fri, 25 Jul 2014 08:32:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362875 - head/polish/ekg2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jul 2014 08:32:28 -0000 Author: pawel Date: Fri Jul 25 08:32:27 2014 New Revision: 362875 URL: http://svnweb.freebsd.org/changeset/ports/362875 QAT: https://qat.redports.org/buildarchive/r362875/ Log: - Fix build on current - Reword options descriptions to current standards - Use CONFIGURE_WITH helper Modified: head/polish/ekg2/Makefile Modified: head/polish/ekg2/Makefile ============================================================================== --- head/polish/ekg2/Makefile Fri Jul 25 07:43:01 2014 (r362874) +++ head/polish/ekg2/Makefile Fri Jul 25 08:32:27 2014 (r362875) @@ -17,7 +17,7 @@ LIB_DEPENDS= libgadu.so:${PORTSDIR}/poli LICENSE= GPLv2 GNU_CONFIGURE= yes -USES= gmake iconv pathfix pkgconfig libtool +USES= gmake iconv libtool pathfix pkgconfig readline CONFIGURE_ARGS+= --enable-shared \ --disable-static \ @@ -38,65 +38,53 @@ OPTIONS_DEFINE= ASPELL GPG GSM GTK2 NLS OPTIONS_DEFAULT=ASPELL OPTIONS_SUB= yes -ASPELL_DESC= Enable spell checking support -GPG_DESC= Enable gpg plugin -GSM_DESC= Enable gsm audio plugin -GTK2_DESC= Enable gtk plugin -PERL_DESC= Enable perl plugin -PYTHON_DESC= Enable python plugin -SQLITE_DESC= Enable sqlite plugin -UNICODE_DESC= Enable unicode (experimental) -XOSD_DESC= Enable xosd plugin +GPG_DESC= GPG plugin +GSM_DESC= GSM audio plugin +GTK2_DESC= GTK+ 2 plugin +PERL_DESC= Perl plugin +PYTHON_DESC= Python plugin +SQLITE_DESC= SQLite plugin +UNICODE_DESC= Unicode support (experimental) +XOSD_DESC= Xosd plugin -ASPELL_CONFIGURE_ON= --with-aspell -ASPELL_CONFIGURE_OFF= --without-aspell +ASPELL_CONFIGURE_WITH= aspell ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell ASPELL_RUN_DEPENDS= ${LOCALBASE}/share/aspell/pl.rws:${PORTSDIR}/polish/aspell -GPG_CONFIGURE_ON= --with-gpg -GPG_CONFIGURE_OFF= --without-gpg +GPG_CONFIGURE_WITH= gpg GPG_LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme \ libgpg-error.so:${PORTSDIR}/security/libgpg-error GPG_RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg -GSM_CONFIGURE_ON= --with-libgsm -GSM_CONFIGURE_OFF= --without-libgsm +GSM_CONFIGURE_WITH= libgsm GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm -GTK2_CONFIGURE_ON= --with-gtk -GTK2_CONFIGURE_OFF= --without-gtk +GTK2_CONFIGURE_WITH= gtk +GTK2_USE= GNOME=gtk2 NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext -PERL_CONFIGURE_ON= --with-perl -PERL_CONFIGURE_OFF= --without-perl +PERL_CONFIGURE_WITH= perl PERL_USES= perl5 -PYTHON_CONFIGURE_ON= --with-python -PYTHON_CONFIGURE_OFF= --without-python +PYTHON_CONFIGURE_WITH= python +PYTHON_USE= PYTHON=yes -SQLITE_CONFIGURE_ON= --with-sqlite3 -SQLITE_CONFIGURE_OFF= --without-sqlite3 +SQLITE_CONFIGURE_WITH= sqlite3 SQLITE_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 -UNICODE_CONFIGURE_ON= --enable-unicode +UNICODE_CONFIGURE_ENABLE= unicode -XOSD_CONFIGURE_ON= --with-libxosd -XOSD_CONFIGURE_OFF= --without-libxosd +XOSD_CONFIGURE_WITH= libxosd XOSD_LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd .include -.if ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 -.endif - -.if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= yes -.endif - post-patch: +# needs newer headers for O_NOFOLLOW flag + @${REINPLACE_CMD} '/_XOPEN_SOURCE/ s|600|700|' \ + ${WRKSRC}/plugins/xmsg/xmsg.c .if ${PORT_OPTIONS:MPYTHON} @${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' \ ${WRKSRC}/contrib/python/notify-bubble.py