svn commit: r341361 - head/x11-wm/openbox
Alexey Dokuchaev
danfe at FreeBSD.org
Mon Jan 27 09:44:40 UTC 2014
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 <bsd.port.options.mk>
+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 <bsd.port.options.mk>
+
+.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
+ at dirrm %%DOCSDIR%%/xbm
+ at 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 at boldquot/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en at boldquot
-%%NLS%%@dirrmtry share/locale/en at quot/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en at quot
%%NLS%%@dirrmtry share/locale/ia/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ia
- at dirrm %%DOCSDIR%%/xbm
- at dirrm %%DOCSDIR%%
- at dirrm share/themes/Artwiz-boxed/openbox-3
- at dirrm share/themes/Artwiz-boxed
- at dirrm share/themes/Bear2/openbox-3
- at dirrm share/themes/Bear2
- at dirrm share/themes/Clearlooks-3.4/openbox-3
- at dirrm share/themes/Clearlooks-3.4
- at dirrm share/themes/Clearlooks/openbox-3
- at dirrmtry share/themes/Clearlooks
- at dirrm share/themes/Clearlooks-Olive/openbox-3
- at dirrmtry share/themes/Clearlooks-Olive
- at dirrm share/themes/Mikachu/openbox-3
- at dirrm share/themes/Mikachu
- at dirrm share/themes/Natura/openbox-3
- at dirrm share/themes/Natura
+%%NLS%%@dirrmtry share/locale/en at quot/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en at quot
+%%NLS%%@dirrmtry share/locale/en at boldquot/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en at boldquot
+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bn_IN
+ at dirrmtry share/xsessions
+ at dirrm share/themes/Syscrash/openbox-3
+ at 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
- at dirrm share/themes/Syscrash/openbox-3
- at dirrm share/themes/Syscrash
+ at dirrm share/themes/Natura/openbox-3
+ at dirrm share/themes/Natura
+ at dirrm share/themes/Mikachu/openbox-3
+ at dirrm share/themes/Mikachu
+ at dirrm share/themes/Clearlooks/openbox-3
+ at dirrm share/themes/Clearlooks-Olive/openbox-3
+ at dirrmtry share/themes/Clearlooks-Olive
+ at dirrm share/themes/Clearlooks-3.4/openbox-3
+ at dirrm share/themes/Clearlooks-3.4
+ at dirrmtry share/themes/Clearlooks
+ at dirrm share/themes/Bear2/openbox-3
+ at dirrm share/themes/Bear2
+ at dirrm share/themes/Artwiz-boxed/openbox-3
+ at dirrm share/themes/Artwiz-boxed
@dirrmtry share/themes
- at comment @dirrm %%DATADIR%%
+ at dirrmtry share/gnome-session/sessions
+ at 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
- at dirrmtry share/gnome-session/sessions
- at dirrmtry share/gnome-session
- at dirrmtry share/xsessions
More information about the svn-ports-all
mailing list