x11-wm/fvwm-crystal: upgrade 3.0.6 -> 3.4.1
- update WWW to SF - no longer limited to python2.x PR: 239625 Submitted by: Walter Schwarzenfeld <w.schwarzenfeld@utanet.at> Approved by: giacomomariani@yahoo.it (maintainer timeout) Relnotes: https://sourceforge.net/p/fvwm-crystal/code/HEAD/tree/ChangeLog
This commit is contained in:
Kurt Jaeger
parent
302f234bdc
commit
d7d60e7f09
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=509552
5 changed files with 1098 additions and 186 deletions
|
|
@ -2,20 +2,21 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= fvwm-crystal
|
||||
PORTVERSION= 3.0.6
|
||||
PORTREVISION= 11
|
||||
PORTVERSION= 3.4.1
|
||||
CATEGORIES= x11-wm
|
||||
MASTER_SITES= https://sourceforge.net/projects/fvwm-crystal/files/${PORTVERSION}/
|
||||
DISTFILE_SUFX= download
|
||||
|
||||
MAINTAINER= giacomomariani@yahoo.it
|
||||
COMMENT= Easy, eye-candy, light, and powerful window manager for X11
|
||||
|
||||
LICENSE= GPLv3+
|
||||
|
||||
RUN_DEPENDS= fvwm>=2.5:x11-wm/fvwm2 \
|
||||
bash:shells/bash
|
||||
|
||||
USES= gettext gmake python:2.7 shebangfix
|
||||
SHEBANG_FILES= addons/* bin/* fvwm/scripts/speed_value \
|
||||
USES= gettext gmake python shebangfix
|
||||
|
||||
SHEBANG_FILES= addons/* bin/* fvwm/scripts/* \
|
||||
fvwm/scripts/FvwmMPD/*.py
|
||||
MAKE_ENV= prefix="${PREFIX}" addondir="${DOCSDIR}/addons"
|
||||
PORTDOCS= *
|
||||
|
|
@ -32,22 +33,26 @@ TRAYER_DESC= Tray (notification area) support
|
|||
SUDO_DESC= Run text-based applications as superuser
|
||||
HSETROOT_DESC= Allow to set desktop wallpaper
|
||||
CMUS_DESC= Play music via audio/cmus player
|
||||
MROX_RUN_DEPENDS= rox:x11-fm/rox-filer
|
||||
ROX_RUN_DEPENDS= rox:x11-fm/rox-filer
|
||||
IMAGEMAGICK_RUN_DEPENDS= display:graphics/ImageMagick6
|
||||
XSCREENSAVER_RUN_DEPENDS= xscreensaver:x11/xscreensaver
|
||||
TRAYER_RUN_DEPENDS= trayer:x11/trayer
|
||||
SUDO_RUN_DEPENDS= sudo:security/sudo
|
||||
SETROOT_RUN_DEPENDS= hsetroot:x11/hsetroot
|
||||
HSETROOT_RUN_DEPENDS= hsetroot:x11/hsetroot
|
||||
CMUS_RUN_DEPENDS= cmus:audio/cmus
|
||||
DOCS_INSTALL_TARGET= install-doc
|
||||
|
||||
post-extract:
|
||||
@cd ${WRKSRC} && ${FIND} . -depth -type d -name .svn \
|
||||
cd ${WRKSRC} && ${FIND} . -depth -type d -name .svn \
|
||||
-exec ${RM} -r {} \;
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|cp -r -d|cp -r|; s|cp -d|cp|' \
|
||||
${REINPLACE_CMD} -e 's|cp -r -d|cp -r|; s|cp -d|cp|' \
|
||||
${WRKSRC}/${MAKEFILE}
|
||||
${REINPLACE_CMD} -e 's|/usr/bin|/usr/local/bin|' \
|
||||
${WRKSRC}/fvwm/preferences/*
|
||||
${GZIP_CMD} ${WRKSRC}/man/*.1
|
||||
|
||||
scrivi:
|
||||
${ECHO_CMD} ${LOCALBASE}
|
||||
${ECHO_CMD} ${PREFIX}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
TIMESTAMP = 1565627491
|
||||
SHA256 (fvwm-crystal-3.0.6.tar.gz) = 9a325f07929e2b4ab2cc8f3e82eab0219d97dd9111c103309711dab324f17fe9
|
||||
SIZE (fvwm-crystal-3.0.6.tar.gz) = 7857363
|
||||
TIMESTAMP = 1565605127
|
||||
SHA256 (fvwm-crystal-3.4.1.tar.gz) = d80241ba4720cee4ac163442a99c977e4441758e399f5aa9c6f8a4c97e109833
|
||||
SIZE (fvwm-crystal-3.4.1.tar.gz) = 5663772
|
||||
|
|
|
|||
|
|
@ -1,61 +1,42 @@
|
|||
--- Makefile.orig 2014-07-02 11:08:31.459626724 +0800
|
||||
+++ Makefile 2014-07-02 11:11:50.634611079 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/make -f
|
||||
.PHONY: all install uninstall dist correctpermissions install-doc uninstall-doc
|
||||
--- Makefile.orig 2015-09-13 17:26:12 UTC
|
||||
+++ Makefile
|
||||
@@ -16,14 +16,13 @@ install: correctpath install-doc
|
||||
|
||||
-prefix?=/usr/local
|
||||
+prefix=$(PREFIX)
|
||||
docdir?=$(prefix)/share/doc/fvwm-crystal/
|
||||
addondir?=$(prefix)/share/fvwm-crystal/addons
|
||||
install -m 755 bin/fvwm-crystal.apps bin/fvwm-crystal.wallpaper bin/fvwm-crystal bin/fvwm-crystal.infoline bin/fvwm-crystal.mplayer-wrapper bin/fvwm-crystal.play-movies bin/fvwm-crystal.videomodeswitch- bin/fvwm-crystal.videomodeswitch+ $(DESTDIR)$(prefix)/bin
|
||||
install -m 755 tmp/fvwm-crystal.generate-menu $(DESTDIR)$(prefix)/bin
|
||||
- cp -d -r fvwm/* $(DESTDIR)$(prefix)/share/fvwm-crystal/fvwm/
|
||||
+ cp -r fvwm/* $(DESTDIR)$(prefix)/share/fvwm-crystal/fvwm/
|
||||
cp tmp/fvwm-crystal $(DESTDIR)/etc/X11/Sessions
|
||||
cp shared/fvwm-crystal.desktop $(DESTDIR)$(prefix)/share/xsessions
|
||||
cp shared/fvwm-crystal.sudoers.d $(DESTDIR)/etc/sudoers.d/fvwm-crystal
|
||||
chmod 440 $(DESTDIR)/etc/sudoers.d/fvwm-crystal
|
||||
|
||||
@@ -12,13 +12,13 @@ all:
|
||||
- mkdir -p $(DESTDIR)$(prefix)/share/man/man1
|
||||
- cp -d -r man/* $(DESTDIR)$(prefix)/share/man/man1
|
||||
+ cp -r man/*.1.gz $(DESTDIR)$(prefix)/man/man1
|
||||
# restore the original file; needed for successive run
|
||||
cp -f tmp/LastChoosenRecipe fvwm/preferences/LastChoosenRecipe
|
||||
|
||||
install: uninstall correctpath
|
||||
@echo Installing fvwm-crystal $(RELEASE) to $(prefix)
|
||||
- mkdir -p $(prefix)/bin $(prefix)/share/fvwm-crystal/fvwm
|
||||
+ mkdir -p $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)/share/fvwm-crystal/fvwm
|
||||
|
||||
- install -m 755 bin/fvwm-crystal.apps bin/fvwm-crystal.wallpaper bin/fvwm-crystal bin/fvwm-crystal.generate-menu bin/fvwm-crystal.infoline bin/fvwm-crystal.mplayer-wrapper $(prefix)/bin
|
||||
- cp -d -r fvwm/* $(prefix)/share/fvwm-crystal/fvwm/
|
||||
+ install -m 755 bin/fvwm-crystal.apps bin/fvwm-crystal.wallpaper bin/fvwm-crystal bin/fvwm-crystal.generate-menu bin/fvwm-crystal.infoline bin/fvwm-crystal.mplayer-wrapper $(DESTDIR)$(prefix)/bin
|
||||
+ cp -r fvwm/* $(DESTDIR)$(prefix)/share/fvwm-crystal/fvwm/
|
||||
|
||||
- mkdir -p $(prefix)/share/man/man1
|
||||
- cp -d -r man/* $(prefix)/share/man/man1
|
||||
+ mkdir -p $(DESTDIR)$(prefix)/man/man1
|
||||
+ cp -r man/* $(DESTDIR)$(prefix)/man/man1
|
||||
|
||||
uninstall:
|
||||
@echo "Uninstalling previously installed fvwm-crystal"
|
||||
@@ -40,7 +40,7 @@ dist-minimal:
|
||||
mkdir -p "fvwm-crystal-minimal-$(RELEASE)"
|
||||
mkdir -p "fvwm-crystal-minimal-$(RELEASE)/fvwm"
|
||||
# Copy basic files
|
||||
- cp -r AUTHORS COPYING INSTALL Makefile NEWS README fvwm-crystal-minimal-$(RELEASE)/
|
||||
+ cp -r AUTHORS INSTALL Makefile NEWS README fvwm-crystal-minimal-$(RELEASE)/
|
||||
cp -r fvwm/config fvwm-crystal-minimal-$(RELEASE)/fvwm/
|
||||
# Copy addons/
|
||||
mkdir -p "fvwm-crystal-minimal-$(RELEASE)/addons"
|
||||
@@ -190,15 +190,15 @@ dist-minimal:
|
||||
|
||||
# It is needed to adjust some path inside fvwm-crystal.generate-menu since this file must know the install path
|
||||
correctpath:
|
||||
- sed -i 's:FC_MENUBASEROOT="/usr/share:FC_MENUBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu
|
||||
- sed -i 's:FC_ICONBASEROOT="/usr/share:FC_ICONBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu
|
||||
@@ -215,11 +214,11 @@ correctpath:
|
||||
cp -f bin/fvwm-crystal.generate-menu tmp
|
||||
cp -f shared/fvwm-crystal tmp
|
||||
cp -f fvwm/preferences/LastChoosenRecipe tmp
|
||||
- sed -i 's:FC_MENUBASEROOT="/usr/share:FC_MENUBASEROOT="$(prefix)/share:' tmp/fvwm-crystal.generate-menu
|
||||
- sed -i 's:FC_ICONBASEROOT="/usr/share:FC_ICONBASEROOT="$(prefix)/share:' tmp/fvwm-crystal.generate-menu
|
||||
- sed -i 's:SYSPREFS="/usr/share:SYSPREFS="$(prefix)/share:' tmp/fvwm-crystal.generate-menu
|
||||
- sed -i 's:/usr/bin:$(prefix)/bin:' tmp/fvwm-crystal
|
||||
- sed -i 's:/usr/bin:$(prefix)/bin:' fvwm/preferences/LastChoosenRecipe
|
||||
+ sed 's:FC_MENUBASEROOT="/usr/share:FC_MENUBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu > bin/fvwm-crystal.generate-menu.new
|
||||
+ sed 's:FC_ICONBASEROOT="/usr/share:FC_ICONBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu.new > bin/fvwm-crystal.generate-menu
|
||||
+ sed 's:SYSPREFS="/usr/share:SYSPREFS="$(prefix)/share:' tmp/fvwm-crystal.generate-menu
|
||||
+ sed 's:/usr/bin:$(prefix)/bin:' tmp/fvwm-crystal
|
||||
+ sed 's:/usr/bin:$(prefix)/bin:' fvwm/preferences/LastChoosenRecipe
|
||||
|
||||
uninstall-doc:
|
||||
-rm -rf $(docdir)
|
||||
-rm -rf $(addondir)
|
||||
|
||||
install-doc:
|
||||
- mkdir -p $(addondir) $(docdir)
|
||||
- install -m 644 addons/* $(addondir)
|
||||
- install -m 644 AUTHORS COPYING NEWS ChangeLog README INSTALL $(docdir)
|
||||
- install -m 644 doc/* $(docdir)
|
||||
+ mkdir -p $(DESTDIR)$(addondir) $(DESTDIR)$(docdir)
|
||||
+ install -m 644 addons/* $(DESTDIR)$(addondir)
|
||||
+ install -m 644 AUTHORS NEWS ChangeLog README INSTALL $(DESTDIR)$(docdir)
|
||||
+ install -m 644 doc/* $(DESTDIR)$(docdir)
|
||||
-rm -rf $(DESTDIR)$(docdir)
|
||||
@@ -229,4 +228,4 @@ install-doc:
|
||||
mkdir -p $(DESTDIR)$(addondir) $(DESTDIR)$(docdir)/html
|
||||
install -m 644 addons/* $(DESTDIR)$(addondir)
|
||||
install -m 644 AUTHORS Contribute NEWS ChangeLog Export.README README INSTALL $(DESTDIR)$(docdir)
|
||||
- cp -d -r doc/* $(DESTDIR)$(docdir)
|
||||
+ cp -r doc/* $(DESTDIR)$(docdir)
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
--- bin/fvwm-crystal.apps.orig 2008-06-23 22:42:54.000000000 +0200
|
||||
+++ bin/fvwm-crystal.apps 2010-06-29 20:54:59.000000000 +0200
|
||||
@@ -102,7 +102,7 @@
|
||||
group = OptionGroup(parser, "General creation options", "Options definig what should be generated")
|
||||
# group.add_option('-g', '--generate', action = 'store', choices=['all','menus','panel','topapps'], dest='generate', default='all', metavar='WHAT',
|
||||
# help = "what should be generated. aviable options are: all, menus, panel, topapps. default is all.")
|
||||
- group.add_option('--with', action = 'append', type='string', dest='with', metavar='DIRECTORY',
|
||||
+ group.add_option('--with', action = 'append', type='string', dest='xwith', metavar='DIRECTORY',
|
||||
help = 'generate entries only for defined entries (directories or files)')
|
||||
group.add_option('--without', action = 'append', type='string', dest='without', metavar='DIRECTORY',
|
||||
help = 'do NOT use defined entries (directories or files) for generating output.')
|
||||
@@ -206,12 +206,12 @@
|
||||
#end of parseArgv
|
||||
|
||||
|
||||
-def getAppsData(databases=[database],checkExecs=False,searchIconsIn='',sortOrder='prio',minLength=3,with=None,without=None,rootName='/Applications',topInSub=True,fileIcon='default.png',dirIcon='directory.png'):
|
||||
+def getAppsData(databases=[database],checkExecs=False,searchIconsIn='',sortOrder='prio',minLength=3,xwith=None,without=None,rootName='/Applications',topInSub=True,fileIcon='default.png',dirIcon='directory.png'):
|
||||
"""Read application databases from directories.
|
||||
if checkExecs is True then use exec_field from file name to check access before adding it to database
|
||||
if searchIconsIn is provided then use this path to check icons existence
|
||||
sortOrder defines sorting order for entries
|
||||
- with is a list of entries (relative to the database root) that should be read
|
||||
+ xwith is a list of entries (relative to the database root) that should be read
|
||||
without is a list of entries (relative to the database root or absolute targets for symlinks) that should be left out
|
||||
"""
|
||||
|
||||
@@ -235,7 +235,7 @@
|
||||
return True
|
||||
return False
|
||||
|
||||
- def get_entry(root,dir,cat,sort,check,with,without,realcat):
|
||||
+ def get_entry(root,dir,cat,sort,check,xwith,without,realcat):
|
||||
if not os.path.isdir(os.path.join(root,dir)) or not os.access(os.path.join(root,dir),os.R_OK):
|
||||
yield None
|
||||
for entry in os.listdir(os.path.join(root,dir)):
|
||||
@@ -268,9 +268,9 @@
|
||||
if not checkFileAccess(test):
|
||||
continue
|
||||
|
||||
- if with and len(with)>0:
|
||||
+ if xwith and len(xwith)>0:
|
||||
cont=False
|
||||
- for i,v in enumerate(with):
|
||||
+ for i,v in enumerate(xwith):
|
||||
if not (os.path.join(cat,name).startswith(v) or os.path.join(cat,name.replace('_',' ')).startswith(v)):
|
||||
cont=True
|
||||
break
|
||||
@@ -305,7 +305,7 @@
|
||||
x = realcat[:]
|
||||
x.extend([prio,name])
|
||||
if access:
|
||||
- for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,with,without,x):
|
||||
+ for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,xwith,without,x):
|
||||
yield sub
|
||||
elif os.path.isfile(file):
|
||||
if sort=='name' or sort=='rname':
|
||||
@@ -327,7 +327,7 @@
|
||||
db=os.path.abspath(os.path.expanduser(databases[i]))
|
||||
if not os.path.isdir(db) or not os.access(db,os.R_OK):
|
||||
continue
|
||||
- for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,with,without,[0,rootName]):
|
||||
+ for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,xwith,without,[0,rootName]):
|
||||
if not entry:
|
||||
continue
|
||||
if not entry[5]:
|
||||
@@ -850,7 +850,7 @@
|
||||
if params[0].database and len(params[0].database)>0:
|
||||
database=params[0].database
|
||||
|
||||
-apps=getAppsData(database,checkExecs=params[0].checkExecs,searchIconsIn=params[0].iconPath,sortOrder=params[0].sortOrder,minLength=params[0].subLength,with=params[0].with,without=params[0].without,rootName=params[0].rootCat,topInSub=params[0].topInSub,fileIcon=params[0].fileDefault,dirIcon=params[0].dirDefault)
|
||||
+apps=getAppsData(database,checkExecs=params[0].checkExecs,searchIconsIn=params[0].iconPath,sortOrder=params[0].sortOrder,minLength=params[0].subLength,xwith=params[0].xwith,without=params[0].without,rootName=params[0].rootCat,topInSub=params[0].topInSub,fileIcon=params[0].fileDefault,dirIcon=params[0].dirDefault)
|
||||
|
||||
########################## DEBUG ################################
|
||||
if params[0].verbosity > 1:
|
||||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue