From owner-svn-ports-head@FreeBSD.ORG Mon Jan 27 09:44:39 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 CFCA2F82; Mon, 27 Jan 2014 09:44:39 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA7E213A5; Mon, 27 Jan 2014 09:44:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0R9id5E031848; Mon, 27 Jan 2014 09:44:39 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0R9iduf031844; Mon, 27 Jan 2014 09:44:39 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201401270944.s0R9iduf031844@svn.freebsd.org> From: Alexey Dokuchaev Date: Mon, 27 Jan 2014 09:44:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341361 - head/x11-wm/openbox 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.17 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: Mon, 27 Jan 2014 09:44:40 -0000 Author: danfe Date: Mon Jan 27 09:44:39 2014 New Revision: 341361 URL: http://svnweb.freebsd.org/changeset/ports/341361 QAT: https://qat.redports.org/buildarchive/r341361/ Log: Stagify, convert to OptionsNG, sort pkg-plist. Modified: head/x11-wm/openbox/Makefile head/x11-wm/openbox/pkg-plist Modified: head/x11-wm/openbox/Makefile ============================================================================== --- head/x11-wm/openbox/Makefile Mon Jan 27 09:36:47 2014 (r341360) +++ head/x11-wm/openbox/Makefile Mon Jan 27 09:44:39 2014 (r341361) @@ -18,40 +18,31 @@ USE_GNOME= glib20 libxml2 gnomehack ltve USE_XORG= xft USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CONFIGURE_ENV= CFLAGS+="-I${LOCALBASE}/include" \ - LDFLAGS+="-L${LOCALBASE}/lib" -MAN1= openbox.1 openbox-session.1 obxprop.1 \ - openbox-gnome-session.1 openbox-kde-session.1 + +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION=${PORTVERSION:C/.[0-9]+\$//} -NO_STAGE= yes -.include +OPTIONS_DEFINE= NLS IMLIB PANGO NOTIFY +OPTIONS_DEFAULT= IMLIB PANGO NOTIFY +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_OFF= --disable-nls -.if !defined(WITHOUT_IMLIB) -USE_EFL= imlib2 -.else -CONFIGURE_ARGS+= --disable-imlib2 -.endif +PANGO_USE= GNOME=pango +PANG_CONFIGURE_OFF= --disable-pango -.if !defined(WITHOUT_PANGO) -USE_GNOME+= pango -.else -CONFIGURE_ARGS+= --disable-pango -.endif +NOTIFY_LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification +NOTIFY_CONFIGURE_OFF= --disable-startup-notification -.if !defined(WITHOUT_STARTUP_NOTIFICATION) -LIB_DEPENDS+= startup-notification-1:${PORTSDIR}/x11/startup-notification +.include + +.if ${PORT_OPTIONS:MIMLIB} +USE_EFL= imlib2 .else -CONFIGURE_ARGS+= --disable-startup-notification +CONFIGURE_ARGS+= --disable-imlib2 .endif post-configure: Modified: head/x11-wm/openbox/pkg-plist ============================================================================== --- head/x11-wm/openbox/pkg-plist Mon Jan 27 09:36:47 2014 (r341360) +++ head/x11-wm/openbox/pkg-plist Mon Jan 27 09:44:39 2014 (r341361) @@ -1,13 +1,3 @@ -include/openbox/%%VERSION%%/obt/link.h -include/openbox/%%VERSION%%/obt/display.h -include/openbox/%%VERSION%%/obt/keyboard.h -include/openbox/%%VERSION%%/obt/xml.h -include/openbox/%%VERSION%%/obt/paths.h -include/openbox/%%VERSION%%/obt/prop.h -include/openbox/%%VERSION%%/obt/signal.h -include/openbox/%%VERSION%%/obt/util.h -include/openbox/%%VERSION%%/obt/version.h -include/openbox/%%VERSION%%/obt/xqueue.h include/openbox/%%VERSION%%/obrender/color.h include/openbox/%%VERSION%%/obrender/font.h include/openbox/%%VERSION%%/obrender/geom.h @@ -18,8 +8,18 @@ include/openbox/%%VERSION%%/obrender/mas include/openbox/%%VERSION%%/obrender/render.h include/openbox/%%VERSION%%/obrender/theme.h include/openbox/%%VERSION%%/obrender/version.h -bin/gnome-panel-control +include/openbox/%%VERSION%%/obt/display.h +include/openbox/%%VERSION%%/obt/keyboard.h +include/openbox/%%VERSION%%/obt/link.h +include/openbox/%%VERSION%%/obt/paths.h +include/openbox/%%VERSION%%/obt/prop.h +include/openbox/%%VERSION%%/obt/signal.h +include/openbox/%%VERSION%%/obt/util.h +include/openbox/%%VERSION%%/obt/version.h +include/openbox/%%VERSION%%/obt/xml.h +include/openbox/%%VERSION%%/obt/xqueue.h bin/gdm-control +bin/gnome-panel-control bin/obxprop bin/openbox bin/openbox-gnome-session @@ -41,12 +41,29 @@ libdata/pkgconfig/obrender-%%VERSION%%.p libdata/pkgconfig/obt-%%VERSION%%.pc libexec/openbox-autostart libexec/openbox-xdg-autostart +man/man1/obxprop.1.gz +man/man1/openbox-gnome-session.1.gz +man/man1/openbox-kde-session.1.gz +man/man1/openbox-session.1.gz +man/man1/openbox.1.gz share/applications/openbox.desktop -share/gnome/wm-properties/openbox.desktop -share/gnome-session/sessions/openbox-gnome.session share/gnome-session/sessions/openbox-gnome-fallback.session +share/gnome-session/sessions/openbox-gnome.session +share/gnome/wm-properties/openbox.desktop share/pixmaps/openbox.png share/themes/Artwiz-boxed/openbox-3/themerc +share/themes/Bear2/openbox-3/close.xbm +share/themes/Bear2/openbox-3/close_pressed.xbm +share/themes/Bear2/openbox-3/desk.xbm +share/themes/Bear2/openbox-3/desk_toggled.xbm +share/themes/Bear2/openbox-3/iconify.xbm +share/themes/Bear2/openbox-3/iconify_pressed.xbm +share/themes/Bear2/openbox-3/max.xbm +share/themes/Bear2/openbox-3/max_pressed.xbm +share/themes/Bear2/openbox-3/max_toggled.xbm +share/themes/Bear2/openbox-3/shade.xbm +share/themes/Bear2/openbox-3/shade_pressed.xbm +share/themes/Bear2/openbox-3/themerc share/themes/Clearlooks-3.4/openbox-3/themerc share/themes/Clearlooks-Olive/openbox-3/themerc share/themes/Clearlooks/openbox-3/themerc @@ -69,46 +86,36 @@ share/themes/Natura/openbox-3/max_toggle share/themes/Natura/openbox-3/shade.xbm share/themes/Natura/openbox-3/shade_hover.xbm share/themes/Natura/openbox-3/themerc -share/themes/Onyx/openbox-3/themerc share/themes/Onyx-Citrus/openbox-3/themerc +share/themes/Onyx/openbox-3/themerc share/themes/Orang/openbox-3/themerc +share/themes/Syscrash/openbox-3/max.xbm share/themes/Syscrash/openbox-3/max_disabled.xbm share/themes/Syscrash/openbox-3/max_pressed.xbm share/themes/Syscrash/openbox-3/max_toggled.xbm -share/themes/Syscrash/openbox-3/max.xbm share/themes/Syscrash/openbox-3/themerc -share/themes/Bear2/openbox-3/close.xbm -share/themes/Bear2/openbox-3/close_pressed.xbm -share/themes/Bear2/openbox-3/desk.xbm -share/themes/Bear2/openbox-3/desk_toggled.xbm -share/themes/Bear2/openbox-3/iconify.xbm -share/themes/Bear2/openbox-3/iconify_pressed.xbm -share/themes/Bear2/openbox-3/max.xbm -share/themes/Bear2/openbox-3/max_pressed.xbm -share/themes/Bear2/openbox-3/max_toggled.xbm -share/themes/Bear2/openbox-3/shade.xbm -share/themes/Bear2/openbox-3/shade_pressed.xbm -share/themes/Bear2/openbox-3/themerc -share/xsessions/openbox.desktop share/xsessions/openbox-gnome.desktop share/xsessions/openbox-kde.desktop -%%DOCSDIR%%/COMPLIANCE -%%DOCSDIR%%/README +share/xsessions/openbox.desktop %%DOCSDIR%%/AUTHORS %%DOCSDIR%%/CHANGELOG +%%DOCSDIR%%/COMPLIANCE %%DOCSDIR%%/COPYING -%%DOCSDIR%%/rc.xsd +%%DOCSDIR%%/README %%DOCSDIR%%/menu.xsd %%DOCSDIR%%/rc-mouse-focus.xml +%%DOCSDIR%%/rc.xsd %%DOCSDIR%%/xbm/bullet.xbm %%DOCSDIR%%/xbm/close.xbm -%%DOCSDIR%%/xbm/desk_toggled.xbm %%DOCSDIR%%/xbm/desk.xbm +%%DOCSDIR%%/xbm/desk_toggled.xbm %%DOCSDIR%%/xbm/iconify.xbm -%%DOCSDIR%%/xbm/max_toggled.xbm %%DOCSDIR%%/xbm/max.xbm -%%DOCSDIR%%/xbm/shade_toggled.xbm +%%DOCSDIR%%/xbm/max_toggled.xbm %%DOCSDIR%%/xbm/shade.xbm +%%DOCSDIR%%/xbm/shade_toggled.xbm +@dirrm %%DOCSDIR%%/xbm +@dirrm %%DOCSDIR%% %%NLS%%share/locale/af/LC_MESSAGES/openbox.mo %%NLS%%share/locale/ar/LC_MESSAGES/openbox.mo %%NLS%%share/locale/be/LC_MESSAGES/openbox.mo @@ -148,40 +155,40 @@ share/xsessions/openbox-kde.desktop %%NLS%%share/locale/vi/LC_MESSAGES/openbox.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/openbox.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/openbox.mo -%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/bn_IN -%%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/en@boldquot -%%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/en@quot %%NLS%%@dirrmtry share/locale/ia/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ia -@dirrm %%DOCSDIR%%/xbm -@dirrm %%DOCSDIR%% -@dirrm share/themes/Artwiz-boxed/openbox-3 -@dirrm share/themes/Artwiz-boxed -@dirrm share/themes/Bear2/openbox-3 -@dirrm share/themes/Bear2 -@dirrm share/themes/Clearlooks-3.4/openbox-3 -@dirrm share/themes/Clearlooks-3.4 -@dirrm share/themes/Clearlooks/openbox-3 -@dirrmtry share/themes/Clearlooks -@dirrm share/themes/Clearlooks-Olive/openbox-3 -@dirrmtry share/themes/Clearlooks-Olive -@dirrm share/themes/Mikachu/openbox-3 -@dirrm share/themes/Mikachu -@dirrm share/themes/Natura/openbox-3 -@dirrm share/themes/Natura +%%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/en@quot +%%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/en@boldquot +%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/bn_IN +@dirrmtry share/xsessions +@dirrm share/themes/Syscrash/openbox-3 +@dirrm share/themes/Syscrash @dirrm share/themes/Orang/openbox-3 @dirrm share/themes/Orang @dirrm share/themes/Onyx/openbox-3 @dirrm share/themes/Onyx-Citrus/openbox-3 @dirrm share/themes/Onyx-Citrus @dirrm share/themes/Onyx -@dirrm share/themes/Syscrash/openbox-3 -@dirrm share/themes/Syscrash +@dirrm share/themes/Natura/openbox-3 +@dirrm share/themes/Natura +@dirrm share/themes/Mikachu/openbox-3 +@dirrm share/themes/Mikachu +@dirrm share/themes/Clearlooks/openbox-3 +@dirrm share/themes/Clearlooks-Olive/openbox-3 +@dirrmtry share/themes/Clearlooks-Olive +@dirrm share/themes/Clearlooks-3.4/openbox-3 +@dirrm share/themes/Clearlooks-3.4 +@dirrmtry share/themes/Clearlooks +@dirrm share/themes/Bear2/openbox-3 +@dirrm share/themes/Bear2 +@dirrm share/themes/Artwiz-boxed/openbox-3 +@dirrm share/themes/Artwiz-boxed @dirrmtry share/themes -@comment @dirrm %%DATADIR%% +@dirrmtry share/gnome-session/sessions +@dirrmtry share/gnome-session @dirrmtry libdata/pkgconfig @dirrm include/openbox/%%VERSION%%/obt @dirrm include/openbox/%%VERSION%%/obrender @@ -189,6 +196,3 @@ share/xsessions/openbox-kde.desktop @dirrm include/openbox @dirrm etc/xdg/openbox @dirrmtry etc/xdg -@dirrmtry share/gnome-session/sessions -@dirrmtry share/gnome-session -@dirrmtry share/xsessions