Index: head/x11-wm/openbox/Makefile =================================================================== --- head/x11-wm/openbox/Makefile (revision 490491) +++ head/x11-wm/openbox/Makefile (revision 490492) @@ -1,60 +1,67 @@ # Created by: trevor # $FreeBSD$ PORTNAME= openbox PORTVERSION= 3.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://openbox.org/dist/openbox/ MAINTAINER= novel@FreeBSD.org COMMENT= Small, fast, standards compliant, extensible window manager LICENSE= GPLv2 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 GNU_CONFIGURE= yes USES= gmake libtool pathfix python:run pkgconfig shebangfix USE_GNOME= cairo glib20 libxml2 USE_XORG= ice sm x11 xcursor xext xft xinerama xrandr \ xrender xau USE_LDCONFIG= yes INSTALL_TARGET= install-strip SHEBANG_FILES= data/autostart/openbox-xdg-autostart +ETCDIR= ${PREFIX}/etc/xdg/${PORTNAME} CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lXext PLIST_SUB= VERSION=${PORTVERSION} OPTIONS_DEFINE= NLS IMLIB PANGO SVG NOTIFY PATCHES OPTIONS_DEFAULT= IMLIB PANGO NOTIFY SVG OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls PANGO_USE= GNOME=pango PANG_CONFIGURE_OFF= --disable-pango NOTIFY_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification NOTIFY_CONFIGURE_OFF= --disable-startup-notification IMLIB_CONFIGURE_ENABLE= imlib2 IMLIB_LIB_DEPENDS= libImlib2.so:graphics/imlib2 SVG_USE= GNOME=librsvg2 SVG_CONFIGURE_ENABLE= librsvg PATCHES_DESC= Enable 3rd party patches (such as rounded corners) PATCHES_EXTRA_PATCHES= ${PATCHDIR}/openbox-3.5.0-title-matching.patch:-p1 \ ${PATCHDIR}/openbox-3.5.0-which-2.20.patch:-p1 \ ${PATCHDIR}/openbox-3.6.2-fix-out-of-bounds.patch:-p1 \ ${PATCHDIR}/openbox-3.6.2-rounded-corners.patch:-p1 post-configure: @${CHMOD} +x ${WRKSRC}/install-sh + +post-install: +.for config_file in autostart environment menu.xml rc.xml + @${MV} ${STAGEDIR}${ETCDIR}/${config_file} \ + ${STAGEDIR}${ETCDIR}/${config_file}.sample +.endfor .include Index: head/x11-wm/openbox/pkg-plist =================================================================== --- head/x11-wm/openbox/pkg-plist (revision 490491) +++ head/x11-wm/openbox/pkg-plist (revision 490492) @@ -1,156 +1,156 @@ include/openbox/%%VERSION%%/obrender/color.h include/openbox/%%VERSION%%/obrender/font.h include/openbox/%%VERSION%%/obrender/geom.h include/openbox/%%VERSION%%/obrender/gradient.h include/openbox/%%VERSION%%/obrender/image.h include/openbox/%%VERSION%%/obrender/instance.h include/openbox/%%VERSION%%/obrender/mask.h include/openbox/%%VERSION%%/obrender/render.h include/openbox/%%VERSION%%/obrender/theme.h include/openbox/%%VERSION%%/obrender/version.h 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 bin/openbox-kde-session bin/openbox-session -etc/xdg/openbox/autostart -etc/xdg/openbox/environment -etc/xdg/openbox/menu.xml -etc/xdg/openbox/rc.xml +@sample %%ETCDIR%%/autostart.sample +@sample %%ETCDIR%%/environment.sample +@sample %%ETCDIR%%/menu.xml.sample +@sample %%ETCDIR%%/rc.xml.sample lib/libobrender.a lib/libobrender.so lib/libobrender.so.29 lib/libobrender.so.29.0.2 lib/libobt.a lib/libobt.so lib/libobt.so.2 lib/libobt.so.2.0.2 libdata/pkgconfig/obrender-3.5.pc libdata/pkgconfig/obt-3.5.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-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 share/themes/Mikachu/openbox-3/bullet.xbm share/themes/Mikachu/openbox-3/close.xbm share/themes/Mikachu/openbox-3/desk.xbm share/themes/Mikachu/openbox-3/iconify.xbm share/themes/Mikachu/openbox-3/max.xbm share/themes/Mikachu/openbox-3/themerc share/themes/Natura/openbox-3/close.xbm share/themes/Natura/openbox-3/close_hover.xbm share/themes/Natura/openbox-3/desk.xbm share/themes/Natura/openbox-3/desk_hover.xbm share/themes/Natura/openbox-3/desk_toggled.xbm share/themes/Natura/openbox-3/iconify.xbm share/themes/Natura/openbox-3/iconify_hover.xbm share/themes/Natura/openbox-3/max.xbm share/themes/Natura/openbox-3/max_hover.xbm share/themes/Natura/openbox-3/max_toggled.xbm share/themes/Natura/openbox-3/shade.xbm share/themes/Natura/openbox-3/shade_hover.xbm share/themes/Natura/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/themerc share/xsessions/openbox-gnome.desktop share/xsessions/openbox-kde.desktop share/xsessions/openbox.desktop %%DOCSDIR%%/AUTHORS %%DOCSDIR%%/CHANGELOG %%DOCSDIR%%/COMPLIANCE %%DOCSDIR%%/COPYING %%DOCSDIR%%/README %%DOCSDIR%%/menu.xsd %%DOCSDIR%%/rc-mouse-focus.xml %%DOCSDIR%%/rc.xsd %%DOCSDIR%%/xbm/bullet.xbm %%DOCSDIR%%/xbm/close.xbm %%DOCSDIR%%/xbm/desk.xbm %%DOCSDIR%%/xbm/desk_toggled.xbm %%DOCSDIR%%/xbm/iconify.xbm %%DOCSDIR%%/xbm/max.xbm %%DOCSDIR%%/xbm/max_toggled.xbm %%DOCSDIR%%/xbm/shade.xbm %%DOCSDIR%%/xbm/shade_toggled.xbm %%NLS%%share/locale/af/LC_MESSAGES/openbox.mo %%NLS%%share/locale/ar/LC_MESSAGES/openbox.mo %%NLS%%share/locale/be/LC_MESSAGES/openbox.mo %%NLS%%share/locale/bn_IN/LC_MESSAGES/openbox.mo %%NLS%%share/locale/ca/LC_MESSAGES/openbox.mo %%NLS%%share/locale/cs/LC_MESSAGES/openbox.mo %%NLS%%share/locale/da/LC_MESSAGES/openbox.mo %%NLS%%share/locale/de/LC_MESSAGES/openbox.mo %%NLS%%share/locale/en@boldquot/LC_MESSAGES/openbox.mo %%NLS%%share/locale/en@quot/LC_MESSAGES/openbox.mo %%NLS%%share/locale/es/LC_MESSAGES/openbox.mo %%NLS%%share/locale/et/LC_MESSAGES/openbox.mo %%NLS%%share/locale/eu/LC_MESSAGES/openbox.mo %%NLS%%share/locale/fi/LC_MESSAGES/openbox.mo %%NLS%%share/locale/fr/LC_MESSAGES/openbox.mo %%NLS%%share/locale/gl_ES/LC_MESSAGES/openbox.mo %%NLS%%share/locale/he/LC_MESSAGES/openbox.mo %%NLS%%share/locale/hr/LC_MESSAGES/openbox.mo %%NLS%%share/locale/hu/LC_MESSAGES/openbox.mo %%NLS%%share/locale/ia/LC_MESSAGES/openbox.mo %%NLS%%share/locale/it/LC_MESSAGES/openbox.mo %%NLS%%share/locale/ja/LC_MESSAGES/openbox.mo %%NLS%%share/locale/lt/LC_MESSAGES/openbox.mo %%NLS%%share/locale/lv/LC_MESSAGES/openbox.mo %%NLS%%share/locale/nl/LC_MESSAGES/openbox.mo %%NLS%%share/locale/no/LC_MESSAGES/openbox.mo %%NLS%%share/locale/pl/LC_MESSAGES/openbox.mo %%NLS%%share/locale/pt/LC_MESSAGES/openbox.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/openbox.mo %%NLS%%share/locale/ro/LC_MESSAGES/openbox.mo %%NLS%%share/locale/ru/LC_MESSAGES/openbox.mo %%NLS%%share/locale/sk/LC_MESSAGES/openbox.mo %%NLS%%share/locale/sr/LC_MESSAGES/openbox.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/openbox.mo %%NLS%%share/locale/sv/LC_MESSAGES/openbox.mo %%NLS%%share/locale/tr/LC_MESSAGES/openbox.mo %%NLS%%share/locale/uk/LC_MESSAGES/openbox.mo %%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