diff options
author | miwi <miwi@FreeBSD.org> | 2012-05-31 00:49:12 +0800 |
---|---|---|
committer | miwi <miwi@FreeBSD.org> | 2012-05-31 00:49:12 +0800 |
commit | 21bddc2d1a2042f4ff865a4332c025b6cecd51a1 (patch) | |
tree | 7b85dd509c1a2721bcf825a6028fd3c680a3783b /x11-wm | |
parent | 063b50bb312d418ad41be26a35a64173a0c3b545 (diff) | |
download | freebsd-ports-gnome-21bddc2d1a2042f4ff865a4332c025b6cecd51a1.tar.gz freebsd-ports-gnome-21bddc2d1a2042f4ff865a4332c025b6cecd51a1.tar.zst freebsd-ports-gnome-21bddc2d1a2042f4ff865a4332c025b6cecd51a1.zip |
- Convert complete XFCE to new options framework
While here some extra work:
- Remove 6.X gruft
- Correct NOPORTDOCS
- Pet portlint
- Whitespaces fixes
Reviewed by: beat, bapt (thx!)
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/xfce4-desktop/Makefile | 13 | ||||
-rw-r--r-- | x11-wm/xfce4-panel/Makefile | 19 | ||||
-rw-r--r-- | x11-wm/xfce4-session/Makefile | 11 | ||||
-rw-r--r-- | x11-wm/xfce4-wm/Makefile | 16 | ||||
-rw-r--r-- | x11-wm/xfce4/Makefile | 44 |
5 files changed, 50 insertions, 53 deletions
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile index 83fea8624484..480769ff284d 100644 --- a/x11-wm/xfce4-desktop/Makefile +++ b/x11-wm/xfce4-desktop/Makefile @@ -30,21 +30,22 @@ USE_XFCE= configenv garcon libmenu libutil libexo xfconf CONFIGURE_ARGS+=--enable-gio-unix \ --enable-notifications -OPTIONS= THUNAR "Enable thunar support" on \ - NLS "Enable Native Language Support" on +OPTIONS_DEFINE= THUNAR NLS +OPTIONS_DEFAULT= THUNAR NLS +THUNAR_DESC= Enable thunar support MAN1= xfdesktop.1 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_THUNAR) +.if ${PORT_OPTIONS:MTHUNAR} CONFIGURE_ARGS+=--enable-thunarx --with-file-manager-fallback=Thunar USE_XFCE+= thunar .else CONFIGURE_ARGS+=--disable-thunarx --without-file-manager-fallback .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes CONFIGURE_ARGS+=--enable-nls PLIST_SUB+= NLS="" @@ -56,4 +57,4 @@ PLIST_SUB+= NLS="@comment " post-install: @-update-desktop-database -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index facd6adf37bb..982e4359f05a 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -31,14 +31,13 @@ USE_XFCE= configenv garcon libexo libmenu libutil xfconf USE_XORG= x11 sm CONFIGURE_ARGS+=--enable-gio-unix \ - --disable-gtk-doc-html + --disable-gtk-doc-html -OPTIONS= NLS "Enable Native Language Support" on \ - APIDOCS "Install api documentation" off +OPTIONS_DEFINE= NLS DOCS -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes CONFIGURE_ARGS+=--enable-nls PLIST_SUB+= NLS="" @@ -47,15 +46,15 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif -.if defined(WITHOUT_APIDOCS) -CONFIGURE_ARGS+=--without-html-dir -PLIST_SUB+= APIDOCS="@comment " -.else +.if ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html PLIST_SUB+= APIDOCS="" +.else +CONFIGURE_ARGS+=--without-html-dir +PLIST_SUB+= APIDOCS="@comment " .endif post-install: @-update-desktop-database -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index 7189d41b931a..78d3f46dce40 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -35,14 +35,13 @@ USE_XFCE= configenv libmenu libutil panel xfconf USE_XORG= x11 sm ice CONFIGURE_ARGS+=--enable-legacy-sm \ - --disable-libgnome-keyring \ - --with-xsession-prefix=${LOCALBASE} + --disable-libgnome-keyring \ + --with-xsession-prefix=${LOCALBASE} SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS= NLS "Enable Native Language Support" on \ - GNUPG "Add support of GNU Privacy Guard" off +OPTIONS_DEFINE= NLS GNUPG .include <bsd.port.options.mk> @@ -50,7 +49,7 @@ MAN1= xfce4-session.1 xfce4-session-logout.1 PLIST_SUB= VERSION="4.6" -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" @@ -59,7 +58,7 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif -.if defined(WITH_GNUPG) +.if ${PORT_OPTIONS:MGNUPG} RUN_DEPENDS+= gpg-agent:${PORTSDIR}/security/gnupg .endif diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile index 045ebc14354a..a1b923049a0b 100644 --- a/x11-wm/xfce4-wm/Makefile +++ b/x11-wm/xfce4-wm/Makefile @@ -33,30 +33,30 @@ USE_XFCE= configenv libmenu libutil xfconf USE_XORG= x11 sm xext xrandr xrender DATADIR= ${PREFIX}/share/xfwm4 -OPTIONS= COMPOSITE "Support the experimental X11 Composite extension" on \ - STARTUP "Enable startup notification support" on \ - REVMOUSE "Reverse mouse workspace changing direction" off +OPTIONS_DEFINE= COMPOSITE NOTIFY REVMOUSE +OPTIONS_DEFAULT= COMPOSITE NOTIFY +REVMOUSE_DESC= Reverse mouse workspace changing direction -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_COMPOSITE) +.if ${PORT_OPTIONS:MCOMPOSITE} CONFIGURE_ARGS+=--enable-compositor .else CONFIGURE_ARGS+=--disable-compositor .endif -.if !defined(WITHOUT_STARTUP) +.if ${PORT_OPTIONS:MNOTIFY} LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification CONFIGURE_ARGS+=--enable-startup-notification .else CONFIGURE_ARGS+=--disable-startup-notification .endif -.if defined(WITH_REVMOUSE) +.if ${PORT_OPTIONS:MREVMOUSE} EXTRA_PATCHES= ${FILESDIR}/extrapatch-src__events.c .endif post-install: @-update-desktop-database -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index 2242417db6dd..a461bc1b0829 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -15,16 +15,14 @@ EXTRACT_ONLY= # empty MAINTAINER= xfce@FreeBSD.org COMMENT= The "meta-port" for the Xfce 4 desktop environment -OPTIONS= ICONS "Install a full icon theme" on \ - ORAGE "Install the Xfce calendar application" on \ - MOUSEPAD "Install the Xfce text editor" on \ - TERMINAL "Install the Xfce terminal application" on \ - APPFINDER "Install the Xfce application finder" on \ - MIXER "Install the Xfce mixer application" off \ - PRINT "Install the Xfce printing helper" off \ - SQUEEZE "Install the Xfce archiver application" on \ - GDM "Install the login manager gdm" off \ - NOTIFYD "Install the Xfce notification daemon" on +OPTIONS_DEFINE= ICONS ORANGE MOUSEPAD TERMINAL APPFINDER MIXER PRINT SQUEEZE GDM NOTIFYD +OPTIONS_DEFAULT= ICONS ORANGE MOUSEPAD TERMINAL APPFINDER SQUEEZE NOTIFYD +ORANGE_DESC= Install the Xfce calendar application +MOUSEPAD_DESC= Install the Xfce text editor +TERMINAL_DESC= Install the Xfce terminal application +APPFINDER_DESC= Install the Xfce application finder +SQUEEZE_DESC= Install the Xfce archiver application +NOTIFYD_DESC= Install the Xfce notification daemon RUN_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \ xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \ @@ -36,59 +34,59 @@ RUN_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \ NO_BUILD= yes LATEST_LINK= xfce4 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if exists(${LOCALBASE}/sbin/gdm) WITH_GDM= yes .endif -.if defined(WITH_GDM) +.if ${PORT_OPTIONS:MGDM} RUN_DEPENDS+= ${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm PLIST_FILES= etc/gdm/Sessions/XFce4 \ etc/dm/Sessions/XFce4.desktop PLIST_DIRS= etc/gdm/Sessions .endif -.if !defined(WITHOUT_ICONS) +.if ${PORT_OPTIONS:MICONS} RUN_DEPENDS+= icons-tango-extras>=0.1.0:${PORTSDIR}/x11-themes/icons-tango-extras .endif -.if !defined(WITHOUT_ORAGE) +.if ${PORT_OPTIONS:MORAGE} RUN_DEPENDS+= orage:${PORTSDIR}/deskutils/orage .endif -.if !defined(WITHOUT_MOUSEPAD) +.if ${PORT_OPTIONS:MMOUSEPAD} RUN_DEPENDS+= mousepad:${PORTSDIR}/editors/mousepad .endif -.if !defined(WITHOUT_TERMINAL) +.if ${PORT_OPTIONS:MTERMINAL} RUN_DEPENDS+= Terminal:${PORTSDIR}/x11/Terminal .endif -.if !defined(WITHOUT_APPFINDER) +.if ${PORT_OPTIONS:MAPPFINDER} RUN_DEPENDS+= xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder .endif -.if defined(WITH_MIXER) +.if ${PORT_OPTIONS:MMIXER} RUN_DEPENDS+= ${LOCALBASE}/bin/xfce4-mixer:${PORTSDIR}/audio/xfce4-mixer .endif -.if defined(WITH_PRINT) +.if ${PORT_OPTIONS:MPRINT} RUN_DEPENDS+= xfprint4:${PORTSDIR}/print/xfce4-print .endif -.if !defined(WITHOUT_SQUEEZE) +.if ${PORT_OPTIONS:MSQUEEZE} RUN_DEPENDS+= squeeze:${PORTSDIR}/archivers/squeeze .endif -.if !defined(WITHOUT_NOTIFYD) +.if ${PORT_OPTIONS:MNOTIFYD} RUN_DEPENDS+= xfce4-notifyd-config:${PORTSDIR}/deskutils/xfce4-notifyd .endif do-install: # empty post-install: -.if defined(WITH_GDM) +.if ${PORT_OPTIONS:MGDM} @${TEST} -d ${PREFIX}/etc/gdm/Sessions || \ ${MKDIR} -p ${PREFIX}/etc/gdm/Sessions @${INSTALL_SCRIPT} ${FILESDIR}/XFce4 ${PREFIX}/etc/gdm/Sessions @@ -115,4 +113,4 @@ post-install: @${ECHO} "================================================================" -.include <bsd.port.post.mk> +.include <bsd.port.mk> |