diff options
33 files changed, 216 insertions, 345 deletions
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile index e144dd4c4aa9..ddb9a1819a5b 100644 --- a/archivers/dpkg/Makefile +++ b/archivers/dpkg/Makefile @@ -16,10 +16,9 @@ BUILD_DEPENDS= po4a:${PORTSDIR}/textproc/po4a 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=${DPKGDIR} --libdir=${PREFIX}/libexec \ --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" diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile index c633c7db90d0..e7a5dcf6ab17 100644 --- a/audio/rosegarden/Makefile +++ b/audio/rosegarden/Makefile @@ -21,11 +21,10 @@ LIB_DEPENDS= asound:${PORTSDIR}/audio/alsa-lib \ 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 diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index c129e3258b78..03ce0e2ff9b8 100644 --- a/comms/efax-gtk/Makefile +++ b/comms/efax-gtk/Makefile @@ -32,15 +32,13 @@ LDFLAGS+= -L${LOCALBASE}/lib -pthread -lintl 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} diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile index cb55210d45d1..0107df06a48f 100644 --- a/deskutils/ksmoothdock/Makefile +++ b/deskutils/ksmoothdock/Makefile @@ -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 diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile index f8c3b4a1a643..f6c55034ac14 100644 --- a/deskutils/treeline/Makefile +++ b/deskutils/treeline/Makefile @@ -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/expat2 .if ${PORT_OPTIONS:MHTTPLOAD} DISTFILES+= httpload2.py:plugins -PLIST_SUB+= HTTPLOAD="" -.else -PLIST_SUB+= HTTPLOAD="@comment " .endif do-install: diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile index 7fd880eba5a9..2a31ae3bc84e 100644 --- a/devel/upnp/Makefile +++ b/devel/upnp/Makefile @@ -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|' \ diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile index 0b27fc1b0e93..566630c6a87f 100644 --- a/finance/homebank/Makefile +++ b/finance/homebank/Makefile @@ -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 diff --git a/games/gigalomania/Makefile b/games/gigalomania/Makefile index 67247e2de92e..9adf2992a9e6 100644 --- a/games/gigalomania/Makefile +++ b/games/gigalomania/Makefile @@ -15,6 +15,8 @@ USE_SDL= image mixer sdl PORTDOCS= readme.html +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> post-patch: diff --git a/games/quackle/Makefile b/games/quackle/Makefile index 559d0ef72901..8c4aeabb8498 100644 --- a/games/quackle/Makefile +++ b/games/quackle/Makefile @@ -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 diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile index f1408ee66fbc..d271c711c15d 100644 --- a/graphics/podofo/Makefile +++ b/graphics/podofo/Makefile @@ -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 podofocrop.1 \ 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) -.if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg -CMAKE_ARGS+= -DWANT_LIBJPEG:BOOL=TRUE -.endif +IMPOSE_CMAKE_ON= -DWANT_LUA:BOOL=TRUE +IMPOSE_CXXFLAGS= -I${LUA_INCDIR} +IMPOSE_LDFLAGS= -L${LUA_LIBDIR} -.if ${PORT_OPTIONS:MTIFF} -LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff -CMAKE_ARGS+= -DWANT_TIFF:BOOL=TRUE -.endif +JPEG_CMAKE_ON= -DWANT_LIBJPEG:BOOL=TRUE +JPEG_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg -.if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png -CMAKE_ARGS+= -DWANT_PNG:BOOL=TRUE -.endif +PNG_CMAKE_ON= -DWANT_PNG:BOOL=TRUE +PNG_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png + +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> diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index d8470b007075..f6de105c7ec7 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -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: diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws index a4afab537bb9..c7da62baf3c9 100644 --- a/mail/claws-mail/Makefile.claws +++ b/mail/claws-mail/Makefile.claws @@ -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 diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile index f104f2b9b1f6..e25bbe4192cc 100644 --- a/mail/clawsker/Makefile +++ b/mail/clawsker/Makefile @@ -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 diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile index a3eed9098c55..c6bcfb3bdb30 100644 --- a/mail/libetpan/Makefile +++ b/mail/libetpan/Makefile @@ -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: diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile index 7e6ad39eb4af..ffeebd5e73a3 100644 --- a/multimedia/smtube/Makefile +++ b/multimedia/smtube/Makefile @@ -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: diff --git a/net/yaz/Makefile b/net/yaz/Makefile index 8dd0acc9dd06..5d63d34b558f 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -29,6 +29,8 @@ MAN1= yaz-asncomp.1 yaz-client.1 yaz-config.1 yaz-iconv.1 \ 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} diff --git a/polish/ekg/Makefile b/polish/ekg/Makefile index 64f33bea216f..4b230d8bc1e6 100644 --- a/polish/ekg/Makefile +++ b/polish/ekg/Makefile @@ -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 diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile index 1cfbd2bf630d..ecebf496b96d 100644 --- a/polish/ekg2/Makefile +++ b/polish/ekg2/Makefile @@ -16,9 +16,8 @@ LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/libgadu \ 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 -pthread 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> - -.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 +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 -.if ${PORT_OPTIONS:MGPG} -LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme \ +GPG_CONFIGURE_ON= --with-gpg +GPG_CONFIGURE_OFF= --without-gpg +GPG_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 +GPG_RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg -.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 +GSM_CONFIGURE_ON= --with-libgsm +GSM_CONFIGURE_OFF= --without-libgsm +GSM_LIB_DEPENDS= gsm:${PORTSDIR}/audio/gsm -.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 +GTK2_CONFIGURE_ON= --with-gtk +GTK2_CONFIGURE_OFF= --without-gtk -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+= --enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext -.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 +PERL_CONFIGURE_ON= --with-perl +PERL_CONFIGURE_OFF= --without-perl -.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 +PYTHON_CONFIGURE_ON= --with-python +PYTHON_CONFIGURE_OFF= --without-python + +SQLITE_CONFIGURE_ON= --with-sqlite3 +SQLITE_CONFIGURE_OFF= --without-sqlite3 +SQLITE_LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 + +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: diff --git a/polish/ekg2/pkg-plist b/polish/ekg2/pkg-plist index 4a8f0bf87b1b..d32584cf18cb 100644 --- a/polish/ekg2/pkg-plist +++ b/polish/ekg2/pkg-plist @@ -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 diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile index aaf1332c343f..37d7b573cc77 100644 --- a/polish/kadu/Makefile +++ b/polish/kadu/Makefile @@ -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: diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile index 2bf5428c3def..228f83b29147 100644 --- a/polish/qnapi/Makefile +++ b/polish/qnapi/Makefile @@ -32,6 +32,8 @@ MAN1= qnapi.1 MANCOMPRESSED= yes PORTDOCS= ChangeLog README.pl COPYRIGHT +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> post-patch: diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile index abe6f6fc49ce..9272ca09686f 100644 --- a/sysutils/gsmartcontrol/Makefile +++ b/sysutils/gsmartcontrol/Makefile @@ -38,6 +38,8 @@ MAN1= gsmartcontrol.1 CONFIGURE_ARGS= --disable-libglade +OPTIONS_DEFINE= DOCS + .include <bsd.port.options.mk> post-patch: diff --git a/sysutils/lookat/Makefile b/sysutils/lookat/Makefile index f88d5b3a4973..317a8c2eb1ab 100644 --- a/sysutils/lookat/Makefile +++ b/sysutils/lookat/Makefile @@ -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: diff --git a/textproc/coccigrep/Makefile b/textproc/coccigrep/Makefile index e411b470b554..8200715c60d2 100644 --- a/textproc/coccigrep/Makefile +++ b/textproc/coccigrep/Makefile @@ -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> diff --git a/textproc/coccigrep/pkg-plist b/textproc/coccigrep/pkg-plist index 0388443306b5..e200da1c8a62 100644 --- a/textproc/coccigrep/pkg-plist +++ b/textproc/coccigrep/pkg-plist @@ -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 diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile index 4e36c91102ce..1c8e3aabb368 100644 --- a/textproc/meld/Makefile +++ b/textproc/meld/Makefile @@ -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 diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile index 936fda7b0469..8d1a50c980ff 100644 --- a/www/netsurf/Makefile +++ b/www/netsurf/Makefile @@ -32,16 +32,14 @@ DESKTOP_ENTRIES="NetSurf" "${COMMENT}" "" "${PORTNAME}" "" "true" 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 diff --git a/x11-fonts/freefont-ttf/Makefile b/x11-fonts/freefont-ttf/Makefile index 7be61a05eaf3..47977cfb948b 100644 --- a/x11-fonts/freefont-ttf/Makefile +++ b/x11-fonts/freefont-ttf/Makefile @@ -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} && \ diff --git a/x11-fonts/freefont-ttf/pkg-plist b/x11-fonts/freefont-ttf/pkg-plist index 2b638844efb6..617212840e7d 100644 --- a/x11-fonts/freefont-ttf/pkg-plist +++ b/x11-fonts/freefont-ttf/pkg-plist @@ -12,10 +12,4 @@ lib/X11/fonts/freefont-ttf/FreeSerifBoldItalic.ttf 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 --git a/x11-themes/lxappearance/Makefile b/x11-themes/lxappearance/Makefile index 7486223e53c2..f78fce597aeb 100644 --- a/x11-themes/lxappearance/Makefile +++ b/x11-themes/lxappearance/Makefile @@ -13,7 +13,7 @@ COMMENT= Desktop-independent theme switcher for GTK+ LICENSE= GPLv2 GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake USE_GNOME= gnomehack gtk20 intlhack MAKE_JOBS_SAFE= yes diff --git a/x11-toolkits/c++-gtk-utils/Makefile b/x11-toolkits/c++-gtk-utils/Makefile index 404479cea51a..403b36ed5ff4 100644 --- a/x11-toolkits/c++-gtk-utils/Makefile +++ b/x11-toolkits/c++-gtk-utils/Makefile @@ -26,11 +26,9 @@ PORTDOCS= * OPTIONS_DEFINE= DEBUG DOCS -.include <bsd.port.options.mk> +DEBUG_CONFIGURE_ON= --enable-debug -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif +.include <bsd.port.options.mk> post-configure: .if ! ${PORT_OPTIONS:MDOCS} diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile index 5564cc60e384..2173aceda324 100644 --- a/x11-toolkits/termit/Makefile +++ b/x11-toolkits/termit/Makefile @@ -34,21 +34,15 @@ MAN1= ${PORTNAME}.1 TERMIT_ETC= ${PREFIX}/etc/xdg/${PORTNAME} -OPTIONS_DEFINE= DEBUG +OPTIONS_DEFINE= DEBUG DOCS NLS +OPTIONS_SUB= yes -.include <bsd.port.options.mk> +DEBUG_CMAKE_ON= -DDEBUG:BOOL=YES -.if ${PORT_OPTIONS:MDEBUG} -CMAKE_ARGS+= -DDEBUG:BOOL=YES -.endif +NLS_CMAKE_OFF= -DENABLE_NLS:BOOL=NO +NLS_USES= gettext -.if ${PORT_OPTIONS:MNLS} -PLIST_SUB+= NLS="" -USES+= gettext -.else -CMAKE_ARGS+= -DENABLE_NLS:BOOL=NO -PLIST_SUB+= NLS="@comment " -.endif +.include <bsd.port.options.mk> post-patch: .if ${PORT_OPTIONS:MDOCS} diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile index 3634bd5b1cd5..c684dfe3e905 100644 --- a/x11/xnee/Makefile +++ b/x11/xnee/Makefile @@ -12,9 +12,8 @@ COMMENT= X events recorder and player LICENSE= GPLv3 GNU_CONFIGURE= yes -USE_GMAKE= yes USE_XORG= xtst -USES= pathfix +USES= gmake pathfix MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --enable-cli --disable-doc --disable-xinput2 @@ -23,34 +22,29 @@ MAN1= cnee.1 xnee.1 INFO= xnee OPTIONS_DEFINE= GNEE PNEE +OPTIONS_SUB= yes GNEE_DESC= GUI frontend PNEE_DESC= GNOME panel frontend +GNEE_CONFIGURE_ENABLE= gui +PNEE_CONFIGURE_ENABLE= gnome-applet + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGNEE} -CONFIGURE_ARGS+=--enable-gui USE_GNOME+= gtk20 MAN1+= gnee.1 -PLIST_SUB+= GNEE="" DESKTOP_ENTRIES= "Gnee" "${COMMENT}" "${PORTNAME}.png" \ "gnee" "Development;" true -.else -CONFIGURE_ARGS+=--disable-gui -PLIST_SUB+= GNEE="@comment " .endif .if ${PORT_OPTIONS:MPNEE} BROKEN= Does not build, needs newer gnomepanel -CONFIGURE_ARGS+=-enable-gnome-applet USE_GNOME+= gnomepanel MAN1+= pnee.1 -PLIST_SUB+= PNEE="" .else -CONFIGURE_ARGS+= --disable-gnome-applet CONFIGURE_ENV+= libgnomeui_CFLAGS="${TRUE}" \ libgnomeui_LIBS="${TRUE}" -PLIST_SUB+= PNEE="@comment " .endif post-patch: |