Date: Wed, 10 Jul 2013 19:41:31 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322729 - in head: archivers/dpkg audio/rosegarden comms/efax-gtk deskutils/ksmoothdock deskutils/treeline devel/upnp finance/homebank games/gigalomania games/quackle graphics/podofo ma... Message-ID: <201307101941.r6AJfVP2060264@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Wed Jul 10 19:41:30 2013 New Revision: 322729 URL: http://svnweb.freebsd.org/changeset/ports/322729 Log: Convert my ports to current standards - Switch USE_GMAKE to USES=gmake - Define supported options so users can see them in config dialogs - Use OPTIONS_SUB for plist alteration - Convert to options macros for better readability - Use PORTDOCS where it makes sense Modified: head/archivers/dpkg/Makefile head/audio/rosegarden/Makefile head/comms/efax-gtk/Makefile head/deskutils/ksmoothdock/Makefile head/deskutils/treeline/Makefile head/devel/upnp/Makefile head/finance/homebank/Makefile head/games/gigalomania/Makefile head/games/quackle/Makefile head/graphics/podofo/Makefile head/mail/claws-mail/Makefile head/mail/claws-mail/Makefile.claws head/mail/clawsker/Makefile head/mail/libetpan/Makefile head/multimedia/smtube/Makefile head/net/yaz/Makefile head/polish/ekg/Makefile head/polish/ekg2/Makefile head/polish/ekg2/pkg-plist head/polish/kadu/Makefile head/polish/qnapi/Makefile head/sysutils/gsmartcontrol/Makefile head/sysutils/lookat/Makefile head/textproc/coccigrep/Makefile head/textproc/coccigrep/pkg-plist head/textproc/meld/Makefile head/www/netsurf/Makefile head/x11-fonts/freefont-ttf/Makefile head/x11-fonts/freefont-ttf/pkg-plist head/x11-themes/lxappearance/Makefile head/x11-toolkits/c++-gtk-utils/Makefile head/x11-toolkits/termit/Makefile head/x11/xnee/Makefile Modified: head/archivers/dpkg/Makefile ============================================================================== --- head/archivers/dpkg/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/archivers/dpkg/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -16,10 +16,9 @@ BUILD_DEPENDS= po4a:${PORTSDIR}/textproc RUN_DEPENDS= gmd5sum:${PORTSDIR}/sysutils/coreutils \ gpatch:${PORTSDIR}/devel/patch -USES= iconv +USES= gmake iconv USE_XZ= yes GNU_CONFIGURE= yes -USE_GMAKE= yes USE_PERL5= yes MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/dpkg-${PORTVERSION} @@ -35,15 +34,16 @@ CONFIGURE_ARGS+=--with-admindir=${DPKGDI --disable-compiler-warnings CONFIGURE_ENV+= PERL_LIBDIR="${PREFIX}/${SITE_PERL_REL}" +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes + +NLS_CONFIGURE_OFF= --disable-nls +NLS_USES= gettext + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} MANLANG= "" de fr hu ja pl sv -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " .endif .include "Makefile.man" Modified: head/audio/rosegarden/Makefile ============================================================================== --- head/audio/rosegarden/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/audio/rosegarden/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -21,11 +21,10 @@ LIB_DEPENDS= asound:${PORTSDIR}/audio/al RUN_DEPENDS= dssi_osc_update:${PORTSDIR}/audio/dssi \ lilypond:${PORTSDIR}/print/lilypond -USES= pkgconfig +USES= gmake pkgconfig USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= QTLIBDIR=${QT_LIBDIR} -USE_GMAKE= yes USE_QT4= gui network xml rcc_build moc_build uic_build linguist_build MAKE_JOBS_SAFE= yes INSTALLS_ICONS= yes Modified: head/comms/efax-gtk/Makefile ============================================================================== --- head/comms/efax-gtk/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/comms/efax-gtk/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -32,15 +32,13 @@ LDFLAGS+= -L${LOCALBASE}/lib -pthread -l CONFIGURE_ARGS+=--with-gtk-version=gtk2 -.include <bsd.port.options.mk> +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes + +NLS_CONFIGURE_OFF= --disable-nls +NLS_USES= gettext -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +.include <bsd.port.options.mk> post-install: @${ECHO} Modified: head/deskutils/ksmoothdock/Makefile ============================================================================== --- head/deskutils/ksmoothdock/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/deskutils/ksmoothdock/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ksmoothdock -# Date created: 24 May 2004 -# Whom: Arjan van Leeuwen <avleeuwen@piwebs.com> -# +# Created by: Arjan van Leeuwen <avleeuwen@piwebs.com> # $FreeBSD$ -# PORTNAME= ksmoothdock PORTVERSION= 4.5 @@ -13,12 +9,12 @@ MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}_automake-1.9 MAINTAINER= pawel@FreeBSD.org -COMMENT= A dock program for KDE with smooth zooming +COMMENT= Dock program for KDE with smooth zooming WRKSRC= ${WRKDIR}/${PORTNAME} USE_KDELIBS_VER=3 -USE_GMAKE= yes +USES= gmake USE_AUTOTOOLS= autoconf:env automake:env libtool GNU_CONFIGURE= yes INSTALLS_ICONS= yes Modified: head/deskutils/treeline/Makefile ============================================================================== --- head/deskutils/treeline/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/deskutils/treeline/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -39,16 +39,12 @@ ISPELL_DESC= Install with ispell support PYXML_DESC= Use pythons py-xml instead of textproc/expat2 OPTIONS_DEFAULT= ASPELL PYXML +OPTIONS_SUB= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MASPELL} -BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell -.endif +ASPELL_BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell +ISPELL_BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell -.if ${PORT_OPTIONS:MISPELL} -BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell -.endif +.include <bsd.port.options.mk> .if !${PORT_OPTIONS:MPYXML} LIB_DEPENDS+= expat:${PORTSDIR}/textproc/expat2 @@ -56,9 +52,6 @@ LIB_DEPENDS+= expat:${PORTSDIR}/textproc .if ${PORT_OPTIONS:MHTTPLOAD} DISTFILES+= httpload2.py:plugins -PLIST_SUB+= HTTPLOAD="" -.else -PLIST_SUB+= HTTPLOAD="@comment " .endif do-install: Modified: head/devel/upnp/Makefile ============================================================================== --- head/devel/upnp/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/devel/upnp/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -19,18 +19,13 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+= --with-documentation=${DOCSDIR} PORTDOCS= * -.else -CONFIGURE_ARGS+= --without-documentation -.endif -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug -.endif +OPTIONS_DEFINE= DEBUG DOCS + +DEBUG_CONFIGURE_ON= --enable-debug +DOCS_CONFIGURE_ON= --with-documentation=${DOCSDIR} +DOCS_CONFIGURE_OFF= --without-documentation post-patch: .SILENT ${REINPLACE_CMD} '/^pkgconfigexecdir/s|$$(libdir)|$$(prefix)/libdata|' \ Modified: head/finance/homebank/Makefile ============================================================================== --- head/finance/homebank/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/finance/homebank/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -14,8 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= osp:${PORTSDIR}/textproc/opensp GNU_CONFIGURE= yes -USE_GMAKE= yes -USES= desktop-file-utils +USES= desktop-file-utils gmake shared-mime-info USE_GNOME= gnomehier gtk20 INSTALLS_ICONS= yes Modified: head/games/gigalomania/Makefile ============================================================================== --- head/games/gigalomania/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/games/gigalomania/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -15,6 +15,8 @@ USE_SDL= image mixer sdl PORTDOCS= readme.html +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> post-patch: Modified: head/games/quackle/Makefile ============================================================================== --- head/games/quackle/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/games/quackle/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -18,7 +18,7 @@ LICENSE_COMB= dual WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/quacker -USE_GMAKE= yes +USES= gmake USE_GCC= any USE_QT4= gui moc_build qmake_build MAKE_JOBS_SAFE= yes Modified: head/graphics/podofo/Makefile ============================================================================== --- head/graphics/podofo/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/graphics/podofo/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -16,10 +16,6 @@ LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn freetype:${PORTSDIR}/print/freetype2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig -OPTIONS_DEFINE= JPEG TIFF PNG IMPOSE -OPTIONS_DEFAULT= JPEG TIFF PNG -IMPOSE_DESC= Build impose tool (needs Lua) - USES= cmake CMAKE_ARGS= -DPODOFO_BUILD_SHARED:BOOL=TRUE \ -DPODOFO_BUILD_STATIC:BOOL=FALSE \ @@ -36,28 +32,27 @@ MAN1= podofobox.1 podofocountpages.1 po podofopages.1 podofopdfinfo.1 podofotxt2pdf.1 \ podofotxtextract.1 podofouncompress.1 podofoxmp.1 -.include <bsd.port.options.mk> +OPTIONS_DEFINE= IMPOSE JPEG PNG TIFF +OPTIONS_DEFAULT= JPEG PNG TIFF +IMPOSE_DESC= Build impose tool (needs Lua) + +IMPOSE_CMAKE_ON= -DWANT_LUA:BOOL=TRUE +IMPOSE_CXXFLAGS= -I${LUA_INCDIR} +IMPOSE_LDFLAGS= -L${LUA_LIBDIR} -.if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg -CMAKE_ARGS+= -DWANT_LIBJPEG:BOOL=TRUE -.endif +JPEG_CMAKE_ON= -DWANT_LIBJPEG:BOOL=TRUE +JPEG_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg -.if ${PORT_OPTIONS:MTIFF} -LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff -CMAKE_ARGS+= -DWANT_TIFF:BOOL=TRUE -.endif +PNG_CMAKE_ON= -DWANT_PNG:BOOL=TRUE +PNG_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png -.if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png -CMAKE_ARGS+= -DWANT_PNG:BOOL=TRUE -.endif +TIFF_CMAKE_ON= -DWANT_TIFF:BOOL=TRUE +TIFF_LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff + +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MIMPOSE} USE_LUA= 5.1 -CMAKE_ARGS+= -DWANT_LUA:BOOL=TRUE -CPPFLAGS+= -I${LUA_INCDIR} -LDFLAGS+= -L${LUA_LIBDIR} .endif .include <bsd.port.mk> Modified: head/mail/claws-mail/Makefile ============================================================================== --- head/mail/claws-mail/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/mail/claws-mail/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -20,6 +20,7 @@ MAN1= claws-mail.1 OPTIONS_DEFINE= COMPFACE DEBUG DOCS ENCHANT IPV6 JPILOT LDAP \ MANUAL NLS STARTUP THEMES +OPTIONS_SUB= yes COMPFACE_DESC= X-Face support ENCHANT_DESC= Spell checking support @@ -30,74 +31,39 @@ THEMES_DESC= Additional themes OPTIONS_DEFAULT= COMPFACE ENCHANT MANUAL STARTUP THEMES -.include "Makefile.claws" -.include <bsd.port.options.mk> +COMPFACE_CONFIGURE_ENABLE= compface +COMPFACE_LIB_DEPENDS= compface:${PORTSDIR}/mail/faces -.if ${PORT_OPTIONS:MCOMPFACE} -LIB_DEPENDS+= compface:${PORTSDIR}/mail/faces -CONFIGURE_ARGS+= --enable-compface -.else -CONFIGURE_ARGS+= --disable-compface -.endif +DEBUG_CONFIGURE_ON= --enable-maintainer-mode -.if ${PORT_OPTIONS:MENCHANT} -LIB_DEPENDS+= enchant:${PORTSDIR}/textproc/enchant -CONFIGURE_ARGS+= --enable-enchant -.else -CONFIGURE_ARGS+= --disable-enchant -.endif +ENCHANT_CONFIGURE_ENABLE= enchant +ENCHANT_LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant -.if ${PORT_OPTIONS:MJPILOT} -LIB_DEPENDS+= pisock:${PORTSDIR}/palm/pilot-link -RUN_DEPENDS+= jpilot:${PORTSDIR}/palm/jpilot -CONFIGURE_ARGS+= --enable-jpilot -.else -CONFIGURE_ARGS+= --disable-jpilot -.endif +IPV6_CONFIGURE_ENABLE= ipv6 -.if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --enable-ldap -.else -CONFIGURE_ARGS+= --disable-ldap -.endif +JPILOT_CONFIGURE_ENABLE= jpilot +JPILOT_LIB_DEPENDS= pisock:${PORTSDIR}/palm/pilot-link +JPILOT_RUN_DEPENDS= jpilot:${PORTSDIR}/palm/jpilot -.if ${PORT_OPTIONS:MMANUAL} -BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2html:${PORTSDIR}/textproc/docbook-utils -CONFIGURE_ARGS+= --enable-manual --with-manualdir=${DOCSDIR}/manual -PLIST_SUB+= MANUAL="" -.else -CONFIGURE_ARGS+= --disable-manual -PLIST_SUB+= MANUAL="@comment " -.endif +LDAP_CONFIGURE_ENABLE= ldap -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@Comment " -.endif +MANUAL_CONFIGURE_ON= --enable-manual --with-manualdir=${DOCSDIR}/manual +MANUAL_CONFIGURE_OFF= --disable-manual +MANUAL_BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2html:${PORTSDIR}/textproc/docbook-utils -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-maintainer-mode -.endif +NLS_CONFIGURE_OFF= --disable-nls +NLS_USES= gettext -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif +STARTUP_CONFIGURE_ENABLE= startup-notification +STARTUP_LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification -.if ${PORT_OPTIONS:MSTARTUP} -LIB_DEPENDS+= startup-notification-1:${PORTSDIR}/x11/startup-notification -CONFIGURE_ARGS+= --enable-startup-notification -.else -CONFIGURE_ARGS+= --disable-startup-notification -.endif +THEMES_RUN_DEPENDS= ${LOCALBASE}/share/claws-mail/themes/ZX-0_1.1/down_arrow.xpm:${PORTSDIR}/x11-themes/claws-mail-themes -.if ${PORT_OPTIONS:MTHEMES} -RUN_DEPENDS+= ${LOCALBASE}/share/claws-mail/themes/ZX-0_1.1/down_arrow.xpm:${PORTSDIR}/x11-themes/claws-mail-themes +.include "Makefile.claws" +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MLDAP} +USE_OPENLDAP= yes .endif post-patch: Modified: head/mail/claws-mail/Makefile.claws ============================================================================== --- head/mail/claws-mail/Makefile.claws Wed Jul 10 19:01:44 2013 (r322728) +++ head/mail/claws-mail/Makefile.claws Wed Jul 10 19:41:30 2013 (r322729) @@ -9,7 +9,7 @@ MAINTAINER= pawel@FreeBSD.org LICENSE= GPLv3 USE_BZIP2= yes -USE_GMAKE= yes +USES+= gmake GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes Modified: head/mail/clawsker/Makefile ============================================================================== --- head/mail/clawsker/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/mail/clawsker/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -22,14 +22,12 @@ USE_PERL5= yes MAN1= clawsker.1 PORTDOCS= NEWS README -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext + +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} '/^DATADIR/s|/share||' ${WRKSRC}/Makefile Modified: head/mail/libetpan/Makefile ============================================================================== --- head/mail/libetpan/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/mail/libetpan/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -18,8 +18,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ USE_AUTOTOOLS= libtool autoconf AUTOTOOLSFILES= aclocal.m4 -USE_GMAKE= yes -USES= iconv +USES= gmake iconv USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes @@ -31,23 +30,18 @@ OPTIONS_SINGLE= CRYPTO OPTIONS_SINGLE_CRYPTO= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL -.include <bsd.port.options.mk> +GNUTLS_CONFIGURE_ON= --without-openssl --with-gnutls +GNUTLS_LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ + gcrypt:${PORTSDIR}/security/libgcrypt -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls \ - gcrypt:${PORTSDIR}/security/libgcrypt -CONFIGURE_ARGS+= --without-openssl --with-gnutls -.endif +IPV6_CONFIGURE_ENABLE= ipv6 + +OPENSSL_CONFIGURE_ON= --without-gnutls + +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes -CONFIGURE_ARGS+= --without-gnutls -.endif - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 .endif post-patch: Modified: head/multimedia/smtube/Makefile ============================================================================== --- head/multimedia/smtube/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/multimedia/smtube/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -12,7 +12,7 @@ COMMENT= SMPlayer YouTube browser RUN_DEPENDS= ${LOCALBASE}/bin/smplayer:${PORTSDIR}/multimedia/smplayer USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake ALL_TARGET= #empty USE_QT4= linguist_build moc_build qmake_build rcc_build uic_build QMAKEFLAGS+= QMAKE_CXXFLAGS_RELEASE="" @@ -20,6 +20,8 @@ INSTALLS_ICONS= yes PORTDOCS= * +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> post-patch: Modified: head/net/yaz/Makefile ============================================================================== --- head/net/yaz/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/net/yaz/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -29,6 +29,8 @@ MAN1= yaz-asncomp.1 yaz-client.1 yaz-co MAN7= bib1-attr.7 yaz-log.7 yaz.7 MAN8= yaz-ztest.8 +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> .if !${PORT_OPTIONS:MDOCS} Modified: head/polish/ekg/Makefile ============================================================================== --- head/polish/ekg/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/polish/ekg/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -14,9 +14,8 @@ COMMENT= Text-mode Gadu-Gadu client LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ gadu:${PORTSDIR}/polish/libgadu -USE_GMAKE= yes GNU_CONFIGURE= yes -USES= pathfix pkgconfig +USES= gmake pathfix pkgconfig USE_LDCONFIG= yes CONFIGURE_ARGS= --without-libungif \ @@ -33,16 +32,10 @@ MANCOMPRESSED= no OPTIONS_DEFINE= ASPELL OPENSSL OPTIONS_DEFAULT= OPENSSL -.include <bsd.port.options.mk> +ASPELL_CONFIGURE_ON= --enable-aspell +ASPELL_LIB_DEPENDS= aspell:${PORTSDIR}/polish/aspell -.if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= aspell:${PORTSDIR}/polish/aspell -CONFIGURE_ARGS+= --enable-aspell -.endif - -.if ! ${PORT_OPTIONS:MOPENSSL} -CONFIGURE_ARGS+= --without-openssl -.endif +OPENSSL_CONFIGURE_OFF= --without-openssl post-install: ${STRIP_CMD} ${PREFIX}/bin/ekg Modified: head/polish/ekg2/Makefile ============================================================================== --- head/polish/ekg2/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/polish/ekg2/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -16,9 +16,8 @@ LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/l LICENSE= GPLv2 -USE_GMAKE= yes GNU_CONFIGURE= yes -USES= pathfix pkgconfig iconv +USES= gmake iconv pathfix pkgconfig MAKE_JOBS_SAFE= yes CONFIGURE_ARGS+= --enable-shared \ @@ -37,6 +36,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -lintl -pt CFLAGS+= -I${LOCALBASE}/include OPTIONS_DEFINE= ASPELL GPG GSM GTK2 PERL PYTHON SQLITE UNICODE XOSD +OPTIONS_SUB= yes ASPELL_DESC= Enable spell checking support GPG_DESC= Enable gpg plugin @@ -50,92 +50,55 @@ XOSD_DESC= Enable xosd plugin OPTIONS_DEFAULT=ASPELL -.include <bsd.port.options.mk> +ASPELL_CONFIGURE_ON= --with-aspell +ASPELL_CONFIGURE_OFF= --without-aspell +ASPELL_LIB_DEPENDS= aspell:${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_LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ + gpg-error:${PORTSDIR}/security/libgpg-error +GPG_RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg -.if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell -RUN_DEPENDS+= ${LOCALBASE}/share/aspell/pl.rws:${PORTSDIR}/polish/aspell -CONFIGURE_ARGS+= --with-aspell -.else -CONFIGURE_ARGS+= --without-aspell -.endif +GSM_CONFIGURE_ON= --with-libgsm +GSM_CONFIGURE_OFF= --without-libgsm +GSM_LIB_DEPENDS= gsm:${PORTSDIR}/audio/gsm -.if ${PORT_OPTIONS:MGPG} -LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme \ - gpg-error:${PORTSDIR}/security/libgpg-error -RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg -CONFIGURE_ARGS+= --with-gpg -PLIST_SUB+= GPG_PLUGIN="" -.else -CONFIGURE_ARGS+= --without-gpg -PLIST_SUB+= GPG_PLUGIN="@comment " -.endif +GTK2_CONFIGURE_ON= --with-gtk +GTK2_CONFIGURE_OFF= --without-gtk -.if ${PORT_OPTIONS:MGSM} -LIB_DEPENDS+= gsm:${PORTSDIR}/audio/gsm -CONFIGURE_ARGS+= --with-libgsm -PLIST_SUB+= GSM_PLUGIN="" -.else -CONFIGURE_ARGS+= --without-libgsm -PLIST_SUB+= GSM_PLUGIN="@comment " -.endif +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext -.if ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --with-gtk -PLIST_SUB+= GTK2_PLUGIN="" -.else -CONFIGURE_ARGS+= --without-gtk -PLIST_SUB+= GTK2_PLUGIN="@comment " -.endif +PERL_CONFIGURE_ON= --with-perl +PERL_CONFIGURE_OFF= --without-perl -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+= --enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +PYTHON_CONFIGURE_ON= --with-python +PYTHON_CONFIGURE_OFF= --without-python -.if ${PORT_OPTIONS:MPERL} -USE_PERL5= yes -CONFIGURE_ARGS+= --with-perl -PLIST_SUB+= PERL_PLUGIN="" -.else -CONFIGURE_ARGS+= --without-perl -PLIST_SUB+= PERL_PLUGIN="@comment " -.endif +SQLITE_CONFIGURE_ON= --with-sqlite3 +SQLITE_CONFIGURE_OFF= --without-sqlite3 +SQLITE_LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 -.if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= yes -CONFIGURE_ARGS+= --with-python -PLIST_SUB+= PYTHON_PLUGIN="" -.else -CONFIGURE_ARGS+= --without-python -PLIST_SUB+= PYTHON_PLUGIN="@comment " -.endif +UNICODE_CONFIGURE_ON= --enable-unicode + +XOSD_CONFIGURE_ON= --with-libxosd +XOSD_CONFIGURE_OFF= --without-libxosd +XOSD_LIB_DEPENDS= xosd:${PORTSDIR}/misc/xosd + +.include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MSQLITE} -LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 -CONFIGURE_ARGS+= --with-sqlite3 -PLIST_SUB+= SQLITE_PLUGIN="" -.else -CONFIGURE_ARGS+= --without-sqlite3 -PLIST_SUB+= SQLITE_PLUGIN="@comment " +.if ${PORT_OPTIONS:MGTK2} +USE_GNOME+= gtk20 .endif -.if ${PORT_OPTIONS:MUNICODE} -CONFIGURE_ARGS+= --enable-unicode +.if ${PORT_OPTIONS:MPERL} +USE_PERL5= yes .endif -.if ${PORT_OPTIONS:MXOSD} -LIB_DEPENDS+= xosd:${PORTSDIR}/misc/xosd -CONFIGURE_ARGS+= --with-libxosd -PLIST_SUB+= XOSD_PLUGIN="" -.else -CONFIGURE_ARGS+= --without-libxosd -PLIST_SUB+= XOSD_PLUGIN="@comment " +.if ${PORT_OPTIONS:MPYTHON} +USE_PYTHON= yes .endif post-patch: Modified: head/polish/ekg2/pkg-plist ============================================================================== --- head/polish/ekg2/pkg-plist Wed Jul 10 19:01:44 2013 (r322728) +++ head/polish/ekg2/pkg-plist Wed Jul 10 19:41:30 2013 (r322729) @@ -5,12 +5,12 @@ lib/ekg2/plugins/feed.so lib/ekg2/plugins/feed.la lib/ekg2/plugins/gg.so lib/ekg2/plugins/gg.la -%%GPG_PLUGIN%%lib/ekg2/plugins/gpg.la -%%GPG_PLUGIN%%lib/ekg2/plugins/gpg.so -%%GSM_PLUGIN%%lib/ekg2/plugins/gsm.so -%%GSM_PLUGIN%%lib/ekg2/plugins/gsm.la -%%GTK2_PLUGIN%%lib/ekg2/plugins/gtk.so -%%GTK2_PLUGIN%%lib/ekg2/plugins/gtk.la +%%GPG%%lib/ekg2/plugins/gpg.la +%%GPG%%lib/ekg2/plugins/gpg.so +%%GSM%%lib/ekg2/plugins/gsm.so +%%GSM%%lib/ekg2/plugins/gsm.la +%%GTK2%%lib/ekg2/plugins/gtk.so +%%GTK2%%lib/ekg2/plugins/gtk.la lib/ekg2/plugins/httprc_xajax.la lib/ekg2/plugins/httprc_xajax.so lib/ekg2/plugins/icq.la @@ -25,20 +25,20 @@ lib/ekg2/plugins/jogger.la lib/ekg2/plugins/jogger.so lib/ekg2/plugins/logs.la lib/ekg2/plugins/logs.so -%%SQLITE_PLUGIN%%lib/ekg2/plugins/logsqlite.so -%%SQLITE_PLUGIN%%lib/ekg2/plugins/logsqlite.la +%%SQLITE%%lib/ekg2/plugins/logsqlite.so +%%SQLITE%%lib/ekg2/plugins/logsqlite.la lib/ekg2/plugins/mail.la lib/ekg2/plugins/mail.so lib/ekg2/plugins/ncurses.la lib/ekg2/plugins/ncurses.so -%%PERL_PLUGIN%%lib/ekg2/plugins/perl.so -%%PERL_PLUGIN%%lib/ekg2/plugins/perl.la +%%PERL%%lib/ekg2/plugins/perl.so +%%PERL%%lib/ekg2/plugins/perl.la lib/ekg2/plugins/pcm.la lib/ekg2/plugins/pcm.so lib/ekg2/plugins/polchat.la lib/ekg2/plugins/polchat.so -%%PYTHON_PLUGIN%%lib/ekg2/plugins/python.so -%%PYTHON_PLUGIN%%lib/ekg2/plugins/python.la +%%PYTHON%%lib/ekg2/plugins/python.so +%%PYTHON%%lib/ekg2/plugins/python.la lib/ekg2/plugins/rc.la lib/ekg2/plugins/rc.so lib/ekg2/plugins/readline.la @@ -55,17 +55,17 @@ lib/ekg2/plugins/sms.la lib/ekg2/plugins/sms.so lib/ekg2/plugins/xmsg.la lib/ekg2/plugins/xmsg.so -%%XOSD_PLUGIN%%lib/ekg2/plugins/xosd.so -%%XOSD_PLUGIN%%lib/ekg2/plugins/xosd.la -%%PERL_PLUGIN%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod -%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Ekg2.bs -%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Ekg2.so -%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/.packlist -%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/Irc.bs -%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/Irc.so -%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/.packlist -%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2.pm -%%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2/Irc.pm +%%XOSD%%lib/ekg2/plugins/xosd.so +%%XOSD%%lib/ekg2/plugins/xosd.la +%%PERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Ekg2.bs +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Ekg2.so +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/.packlist +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/Irc.bs +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/Irc.so +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc/.packlist +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2.pm +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2/Irc.pm libexec/ioctld %%DATADIR%%/commands-pl.txt %%DATADIR%%/plugins/autoresponder/vars-en.txt @@ -76,8 +76,8 @@ libexec/ioctld %%DATADIR%%/plugins/gg/session-pl.txt %%DATADIR%%/plugins/gg/vars-en.txt %%DATADIR%%/plugins/gg/vars-pl.txt -%%GPG_PLUGIN%%%%DATADIR%%/plugins/gpg/commands-en.txt -%%GPG_PLUGIN%%%%DATADIR%%/plugins/gpg/commands-pl.txt +%%GPG%%%%DATADIR%%/plugins/gpg/commands-en.txt +%%GPG%%%%DATADIR%%/plugins/gpg/commands-pl.txt %%DATADIR%%/plugins/httprc_xajax/ekg2.css %%DATADIR%%/plugins/httprc_xajax/ekg2.js %%DATADIR%%/plugins/httprc_xajax/xajax_0.2.4.js @@ -89,16 +89,16 @@ libexec/ioctld %%DATADIR%%/plugins/jabber/session-en.txt %%DATADIR%%/plugins/jabber/session-pl.txt %%DATADIR%%/plugins/logs/vars-pl.txt -%%SQLITE_PLUGIN%%%%DATADIR%%/plugins/logsqlite/vars-en.txt -%%SQLITE_PLUGIN%%%%DATADIR%%/plugins/logsqlite/vars-pl.txt -%%SQLITE_PLUGIN%%%%DATADIR%%/plugins/logsqlite/commands-en.txt -%%SQLITE_PLUGIN%%%%DATADIR%%/plugins/logsqlite/commands-pl.txt +%%SQLITE%%%%DATADIR%%/plugins/logsqlite/vars-en.txt +%%SQLITE%%%%DATADIR%%/plugins/logsqlite/vars-pl.txt +%%SQLITE%%%%DATADIR%%/plugins/logsqlite/commands-en.txt +%%SQLITE%%%%DATADIR%%/plugins/logsqlite/commands-pl.txt %%DATADIR%%/plugins/mail/vars-pl.txt %%DATADIR%%/plugins/ncurses/commands-pl.txt %%DATADIR%%/plugins/ncurses/vars-en.txt %%DATADIR%%/plugins/ncurses/vars-pl.txt -%%PYTHON_PLUGIN%%%%DATADIR%%/plugins/python/commands-en.txt -%%PYTHON_PLUGIN%%%%DATADIR%%/plugins/python/commands-pl.txt +%%PYTHON%%%%DATADIR%%/plugins/python/commands-en.txt +%%PYTHON%%%%DATADIR%%/plugins/python/commands-pl.txt %%DATADIR%%/plugins/rc/vars-pl.txt %%DATADIR%%/plugins/readline/vars-en.txt %%DATADIR%%/plugins/readline/vars-pl.txt @@ -110,14 +110,14 @@ libexec/ioctld %%DATADIR%%/plugins/xmsg/session-pl.txt %%DATADIR%%/plugins/xmsg/vars-en.txt %%DATADIR%%/plugins/xmsg/vars-pl.txt -%%XOSD_PLUGIN%%%%DATADIR%%/plugins/xosd/commands-pl.txt -%%XOSD_PLUGIN%%%%DATADIR%%/plugins/xosd/vars-pl.txt -%%PERL_PLUGIN%%%%DATADIR%%/scripts/audioscrobbler_bot.pl -%%PERL_PLUGIN%%%%DATADIR%%/scripts/dns.pl -%%PERL_PLUGIN%%%%DATADIR%%/scripts/ggbe.pl -%%PYTHON_PLUGIN%%%%DATADIR%%/scripts/notify-bubble.py -%%PERL_PLUGIN%%%%DATADIR%%/scripts/slownik.pl -%%PERL_PLUGIN%%%%DATADIR%%/scripts/xmms.pl +%%XOSD%%%%DATADIR%%/plugins/xosd/commands-pl.txt +%%XOSD%%%%DATADIR%%/plugins/xosd/vars-pl.txt +%%PERL%%%%DATADIR%%/scripts/audioscrobbler_bot.pl +%%PERL%%%%DATADIR%%/scripts/dns.pl +%%PERL%%%%DATADIR%%/scripts/ggbe.pl +%%PYTHON%%%%DATADIR%%/scripts/notify-bubble.py +%%PERL%%%%DATADIR%%/scripts/slownik.pl +%%PERL%%%%DATADIR%%/scripts/xmms.pl %%DATADIR%%/session-en.txt %%DATADIR%%/session-pl.txt %%DATADIR%%/themes/blue_sea_dragon.theme @@ -129,29 +129,29 @@ libexec/ioctld %%NLS%%share/locale/de/LC_MESSAGES/ekg2.mo %%NLS%%share/locale/pl/LC_MESSAGES/ekg2.mo @dirrm %%DATADIR%%/themes -%%PERL_PLUGIN%%@dirrmtry %%DATADIR%%/scripts +%%PERL%%@dirrmtry %%DATADIR%%/scripts @dirrm %%DATADIR%%/plugins/autoresponder @dirrm %%DATADIR%%/plugins/gg -%%GPG_PLUGIN%%@dirrm %%DATADIR%%/plugins/gpg +%%GPG%%@dirrm %%DATADIR%%/plugins/gpg @dirrm %%DATADIR%%/plugins/httprc_xajax @dirrm %%DATADIR%%/plugins/ioctld @dirrm %%DATADIR%%/plugins/irc @dirrm %%DATADIR%%/plugins/jabber @dirrm %%DATADIR%%/plugins/logs -%%SQLITE_PLUGIN%%@dirrm %%DATADIR%%/plugins/logsqlite +%%SQLITE%%@dirrm %%DATADIR%%/plugins/logsqlite @dirrm %%DATADIR%%/plugins/mail @dirrm %%DATADIR%%/plugins/ncurses -%%PYTHON_PLUGIN%%@dirrm %%DATADIR%%/plugins/python +%%PYTHON%%@dirrm %%DATADIR%%/plugins/python @dirrm %%DATADIR%%/plugins/rc @dirrm %%DATADIR%%/plugins/readline @dirrm %%DATADIR%%/plugins/sim @dirrm %%DATADIR%%/plugins/sms @dirrm %%DATADIR%%/plugins/xmsg -%%XOSD_PLUGIN%%@dirrm %%DATADIR%%/plugins/xosd +%%XOSD%%@dirrm %%DATADIR%%/plugins/xosd @dirrm %%DATADIR%%/plugins @dirrm %%DATADIR%% -%%PERL_PLUGIN%%@dirrm %%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc -%%PERL_PLUGIN%%@dirrm %%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2 -%%PERL_PLUGIN%%@dirrm %%PERL_PLUGIN%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2 +%%PERL%%@dirrm %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2/Irc +%%PERL%%@dirrm %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ekg2 +%%PERL%%@dirrm %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Ekg2 @dirrm lib/ekg2/plugins @dirrm lib/ekg2 Modified: head/polish/kadu/Makefile ============================================================================== --- head/polish/kadu/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/polish/kadu/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -57,16 +57,14 @@ WANT_GNOME= yes INSTALLS_ICONS= yes OPTIONS_DEFINE= GG_EMOTS +OPTIONS_SUB= yes GG_EMOTS_DESC= Install GG-compatible emoticons .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGG_EMOTS} -PLIST_SUB+= GG_EMOTS="" DISTFILES+= ${GG6_EMOTS_DISTFILE}:additions \ ${GG7_EMOTS_DISTFILE}:additions -.else -PLIST_SUB+= GG_EMOTS="@comment " .endif post-patch: Modified: head/polish/qnapi/Makefile ============================================================================== --- head/polish/qnapi/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/polish/qnapi/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -32,6 +32,8 @@ MAN1= qnapi.1 MANCOMPRESSED= yes PORTDOCS= ChangeLog README.pl COPYRIGHT +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> post-patch: Modified: head/sysutils/gsmartcontrol/Makefile ============================================================================== --- head/sysutils/gsmartcontrol/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/sysutils/gsmartcontrol/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -38,6 +38,8 @@ MAN1= gsmartcontrol.1 CONFIGURE_ARGS= --disable-libglade +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> post-patch: Modified: head/sysutils/lookat/Makefile ============================================================================== --- head/sysutils/lookat/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/sysutils/lookat/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -11,10 +11,12 @@ MAINTAINER= pawel@FreeBSD.org COMMENT= Program to view Un*x text files and manual pages GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake MAN1= lookat.1 +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> post-patch: Modified: head/textproc/coccigrep/Makefile ============================================================================== --- head/textproc/coccigrep/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/textproc/coccigrep/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -22,6 +22,9 @@ USE_PYDISTUTILS=easy_install MANCOMPRESSED= no MAN1= coccigrep.1 +PORTDOCS= ChangeLog README.rst + +OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> Modified: head/textproc/coccigrep/pkg-plist ============================================================================== --- head/textproc/coccigrep/pkg-plist Wed Jul 10 19:01:44 2013 (r322728) +++ head/textproc/coccigrep/pkg-plist Wed Jul 10 19:41:30 2013 (r322729) @@ -19,9 +19,6 @@ bin/coccigrep %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt %%DATADIR%%/cocci-grep.el %%DATADIR%%/cocci-grep.vim -%%PORTDOCS%%%%DOCSDIR%%/README.rst -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%% @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep/data @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/coccigrep Modified: head/textproc/meld/Makefile ============================================================================== --- head/textproc/meld/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/textproc/meld/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -13,24 +13,19 @@ LICENSE= GPLv2 USE_XZ= yes USE_GNOME= pygnome2 -USES= desktop-file-utils +USES= gmake desktop-file-utils USE_PYTHON= -2.7 -USE_GMAKE= yes MAKE_ARGS= prefix=${PREFIX} INSTALLS_ICONS= yes INSTALLS_OMF= yes -OPTIONS_DEFINE= PYGNOMEDESKTOP +OPTIONS_DEFINE= NLS PYGNOMEDESKTOP +OPTIONS_SUB= yes PYGNOMEDESKTOP_DESC= Code syntax highlighting (many dependencies) -.include <bsd.port.options.mk> +NLS_USES= gettext -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} '/docdir_/d' ${WRKSRC}/Makefile Modified: head/www/netsurf/Makefile ============================================================================== --- head/www/netsurf/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/www/netsurf/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -32,16 +32,14 @@ DESKTOP_ENTRIES="NetSurf" "${COMMENT}" " OPTIONS_DEFINE= GSTREAMER WEBP +WEBP_LIB_DEPENDS= webp:${PORTSDIR}/graphics/webp + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGSTREAMER} USE_GSTREAMER= yes .endif -.if ${PORT_OPTIONS:MWEBP} -LIB_DEPENDS+= webp:${PORTSDIR}/graphics/webp -.endif - post-patch: @${REINPLACE_CMD} '/^NSFB_LINUX_AVAILABLE/ s|yes|no| ; s| -g||' \ ${WRKSRC}/src/libnsfb-${NSFB_VERSION}/Makefile Modified: head/x11-fonts/freefont-ttf/Makefile ============================================================================== --- head/x11-fonts/freefont-ttf/Makefile Wed Jul 10 19:01:44 2013 (r322728) +++ head/x11-fonts/freefont-ttf/Makefile Wed Jul 10 19:41:30 2013 (r322729) @@ -23,6 +23,9 @@ USE_ZIP= yes WRKSRC= ${WRKDIR}/freefont-${PORTVERSION} INSTALLDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME} +PORTDOCS= AUTHORS ChangeLog CREDITS README + +OPTIONS_DEFINE= DOCS .include <bsd.port.options.mk> @@ -32,12 +35,8 @@ do-build: do-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CREDITS ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR} + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif ${MKDIR} ${INSTALLDIR} cd ${WRKSRC} && \ Modified: head/x11-fonts/freefont-ttf/pkg-plist ============================================================================== --- head/x11-fonts/freefont-ttf/pkg-plist Wed Jul 10 19:01:44 2013 (r322728) +++ head/x11-fonts/freefont-ttf/pkg-plist Wed Jul 10 19:41:30 2013 (r322729) @@ -12,10 +12,4 @@ lib/X11/fonts/freefont-ttf/FreeSerifBold lib/X11/fonts/freefont-ttf/FreeSerifItalic.ttf lib/X11/fonts/freefont-ttf/fonts.dir lib/X11/fonts/freefont-ttf/fonts.scale -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/X11/fonts/freefont-ttf *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307101941.r6AJfVP2060264>