Index: head/x11-wm/openbox/Makefile =================================================================== --- head/x11-wm/openbox/Makefile (revision 499265) +++ head/x11-wm/openbox/Makefile (revision 499266) @@ -1,67 +1,67 @@ # Created by: trevor # $FreeBSD$ PORTNAME= openbox PORTVERSION= 3.6 -PORTREVISION= 4 +PORTREVISION= 5 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/files/patch-data_autostart_openbox-xdg-autostart =================================================================== --- head/x11-wm/openbox/files/patch-data_autostart_openbox-xdg-autostart (nonexistent) +++ head/x11-wm/openbox/files/patch-data_autostart_openbox-xdg-autostart (revision 499266) @@ -0,0 +1,124 @@ +--- data/autostart/openbox-xdg-autostart.orig 2019-04-15 20:40:28 UTC ++++ data/autostart/openbox-xdg-autostart +@@ -19,6 +19,8 @@ + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + ++from __future__ import print_function ++ + ME="openbox-xdg-autostart" + VERSION="1.1" + +@@ -28,9 +30,9 @@ try: + from xdg.DesktopEntry import DesktopEntry + from xdg.Exceptions import ParsingError + except ImportError: +- print +- print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed" +- print ++ print() ++ print("ERROR:", ME, "requires PyXDG to be installed", file=sys.stderr) ++ print() + sys.exit(1) + + def main(argv=sys.argv): +@@ -51,7 +53,7 @@ def main(argv=sys.argv): + try: + autofile = AutostartFile(path) + except ParsingError: +- print "Invalid .desktop file: " + path ++ print("Invalid .desktop file: " + path) + else: + if not autofile in files: + files.append(autofile) +@@ -99,9 +101,9 @@ class AutostartFile: + + def _alert(self, str, info=False): + if info: +- print "\t ", str ++ print("\t ", str) + else: +- print "\t*", str ++ print("\t*", str) + + def _showInEnvironment(self, envs, verbose=False): + default = not self.de.getOnlyShowIn() +@@ -146,14 +148,14 @@ class AutostartFile: + + def display(self, envs): + if self._shouldRun(envs): +- print "[*] " + self.de.getName() ++ print("[*] " + self.de.getName()) + else: +- print "[ ] " + self.de.getName() ++ print("[ ] " + self.de.getName()) + self._alert("File: " + self.path, info=True) + if self.de.getExec(): + self._alert("Executes: " + self.de.getExec(), info=True) + self._shouldRun(envs, True) +- print ++ print() + + def run(self, envs): + here = os.getcwd() +@@ -165,34 +167,34 @@ class AutostartFile: + os.chdir(here) + + def show_help(): +- print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..." +- print +- print "This tool will run xdg autostart .desktop files" +- print +- print "OPTIONS" +- print " --list Show a list of the files which would be run" +- print " Files which would be run are marked with an asterix" +- print " symbol [*]. For files which would not be run," +- print " information is given for why they are excluded" +- print " --help Show this help and exit" +- print " --version Show version and copyright information" +- print +- print "ENVIRONMENT specifies a list of environments for which to run autostart" +- print "applications. If none are specified, only applications which do not " +- print "limit themselves to certain environments will be run." +- print +- print "ENVIRONMENT can be one or more of:" +- print " GNOME Gnome Desktop" +- print " KDE KDE Desktop" +- print " ROX ROX Desktop" +- print " XFCE XFCE Desktop" +- print " Old Legacy systems" +- print ++ print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...") ++ print() ++ print("This tool will run xdg autostart .desktop files") ++ print() ++ print("OPTIONS") ++ print(" --list Show a list of the files which would be run") ++ print(" Files which would be run are marked with an asterix") ++ print(" symbol [*]. For files which would not be run,") ++ print(" information is given for why they are excluded") ++ print(" --help Show this help and exit") ++ print(" --version Show version and copyright information") ++ print() ++ print("ENVIRONMENT specifies a list of environments for which to run autostart") ++ print("applications. If none are specified, only applications which do not ") ++ print("limit themselves to certain environments will be run.") ++ print() ++ print("ENVIRONMENT can be one or more of:") ++ print(" GNOME Gnome Desktop") ++ print(" KDE KDE Desktop") ++ print(" ROX ROX Desktop") ++ print(" XFCE XFCE Desktop") ++ print(" Old Legacy systems") ++ print() + + def show_version(): +- print ME, VERSION +- print "Copyright (c) 2008 Dana Jansens" +- print ++ print(ME, VERSION) ++ print("Copyright (c) 2008 Dana Jansens") ++ print() + + if __name__ == "__main__": + sys.exit(main()) Property changes on: head/x11-wm/openbox/files/patch-data_autostart_openbox-xdg-autostart ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property