cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update x11/fvwm2 to 2.7.0

Browse Source 
bugfix release, changelog:
https://github.com/fvwmorg/fvwm/releases/tag/2.7.0

diff from Michael (michi+openbsd [at] dataswamp [dot] org - MAINTAINER),
thanks!
This commit is contained in:
op 2022-11-24 10:38:35 +00:00
parent c15cd11c31
commit 18a3252fc1
6 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/fvwm2/Makefile
View File

@ -1,7 +1,6 @@
COMMENT= multiple virtual desktop window manager
VERSION= 2.6.9
REVISION= 1
VERSION= 2.7.0
DISTNAME= fvwm-${VERSION}
PKGNAME= fvwm2-${VERSION}
@ -18,7 +17,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += ICE SM X11 Xcursor Xext Xft Xinerama Xpm Xrender
WANTLIB += c cairo curses fontconfig freetype gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m png
WANTLIB += readline rsvg-2 z
WANTLIB += readline rsvg-2
MASTER_SITES= https://github.com/fvwmorg/fvwm/releases/download/${VERSION}/

4
x11/fvwm2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (fvwm-2.6.9.tar.gz) = G8ZM88zQBzAIdYFoMnqCZbgFne+bI5tFHWufqyzDka4=
SIZE (fvwm-2.6.9.tar.gz) = 3942859
SHA256 (fvwm-2.7.0.tar.gz) = ZoJt1gt3REcXADfZB4/UPnX3IwpJrPuEqYjuvOfjQYs=
SIZE (fvwm-2.7.0.tar.gz) = 3933529

4
x11/fvwm2/patches/patch-configure
View File

@ -1,8 +1,8 @@
Index: configure
--- configure.orig
+++ configure
@@ -11355,7 +11355,7 @@ if test "${with_intl_library+set}" = set; then :
else
@@ -12109,7 +12109,7 @@ then :
else $as_nop
with_intl=maybe
- intl_LIBS="-l${smr_lib}"

16
x11/fvwm2/patches/patch-default-config_Makefile_in
View File

@ -1,16 +1,16 @@
Index: default-config/Makefile.in
--- default-config/Makefile.in.orig
+++ default-config/Makefile.in
@@ -602,9 +602,9 @@ uninstall-am: uninstall-configDATA
@@ -604,9 +604,9 @@ uninstall-am: uninstall-configDATA
install-data-hook:
cp -r $(srcdir)/images $(inst_location)
- ln -sf default-config/FvwmScript-DateTime $(inst_location)/..
- ln -sf default-config/FvwmScript-ConfirmQuit $(inst_location)/..
- ln -sf default-config/FvwmScript-ConfirmCopyConfig $(inst_location)/..
+ mv $(inst_location)/FvwmScript-DateTime $(inst_location)/..
+ mv $(inst_location)/FvwmScript-ConfirmQuit $(inst_location)/..
+ mv $(inst_location)/FvwmScript-ConfirmCopyConfig $(inst_location)/..
cp -r $(srcdir)/images $(inst_location)/default-config
- ln -sf default-config/FvwmScript-DateTime $(inst_location)
- ln -sf default-config/FvwmScript-ConfirmQuit $(inst_location)
- ln -sf default-config/FvwmScript-ConfirmCopyConfig $(inst_location)
+ mv $(inst_location)/default-config/FvwmScript-DateTime $(inst_location)
+ mv $(inst_location)/default-config/FvwmScript-ConfirmQuit $(inst_location)
+ mv $(inst_location)/default-config/FvwmScript-ConfirmCopyConfig $(inst_location)
uninstall-hook:
rm -fr $(DESTDIR)/$(configdir)

2
x11/fvwm2/patches/patch-fvwm_Makefile_in
View File

@ -10,7 +10,7 @@ Index: fvwm/Makefile.in
subdir = fvwm
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -576,7 +576,7 @@ uninstall-binPROGRAMS:
@@ -577,7 +577,7 @@ uninstall-binPROGRAMS:
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)

57
x11/fvwm2/pkg/PLIST
View File

@ -1,8 +1,8 @@
@conflict fvwm2+fvicons-*
@conflict fvicons-*
@pkgpath x11/fvwm2,-main
@pkgpath x11/fvwm2,-fvicons
@pkgpath x11/fvwm2,-fvwm2
@conflict fvwm2+fvicons-*
@conflict fvicons-*
@bin bin/FvwmCommand
bin/fvwm-bug
bin/fvwm-config
@ -23,8 +23,6 @@ libexec/fvwm/${VERSION}/FvwmAudio
@bin libexec/fvwm/${VERSION}/FvwmBanner
@bin libexec/fvwm/${VERSION}/FvwmButtons
libexec/fvwm/${VERSION}/FvwmCascade
libexec/fvwm/${VERSION}/FvwmCommand.pm
libexec/fvwm/${VERSION}/FvwmCommand.sh
@bin libexec/fvwm/${VERSION}/FvwmCommandS
@bin libexec/fvwm/${VERSION}/FvwmConsole
@bin libexec/fvwm/${VERSION}/FvwmConsoleC
@ -132,6 +130,39 @@ share/fvwm/default-config/images/icons/terminal.png
share/fvwm/default-config/images/icons/wallpaper.png
share/fvwm/fvwm-menu-desktop-config.fpl
share/fvwm/fvwm-script-ComExample.pl
share/fvwm/locale/
share/fvwm/locale/ar/
share/fvwm/locale/ar/LC_MESSAGES/
share/fvwm/locale/ar/LC_MESSAGES/FvwmScript.mo
share/fvwm/locale/ar/LC_MESSAGES/fvwm.mo
share/fvwm/locale/da/
share/fvwm/locale/da/LC_MESSAGES/
share/fvwm/locale/da/LC_MESSAGES/FvwmScript.mo
share/fvwm/locale/da/LC_MESSAGES/fvwm.mo
share/fvwm/locale/de/
share/fvwm/locale/de/LC_MESSAGES/
share/fvwm/locale/de/LC_MESSAGES/FvwmScript.mo
share/fvwm/locale/de/LC_MESSAGES/fvwm.mo
share/fvwm/locale/es/
share/fvwm/locale/es/LC_MESSAGES/
share/fvwm/locale/es/LC_MESSAGES/FvwmScript.mo
share/fvwm/locale/es/LC_MESSAGES/fvwm.mo
share/fvwm/locale/fr/
share/fvwm/locale/fr/LC_MESSAGES/
share/fvwm/locale/fr/LC_MESSAGES/FvwmScript.mo
share/fvwm/locale/fr/LC_MESSAGES/fvwm.mo
share/fvwm/locale/ru/
share/fvwm/locale/ru/LC_MESSAGES/
share/fvwm/locale/ru/LC_MESSAGES/FvwmScript.mo
share/fvwm/locale/ru/LC_MESSAGES/fvwm.mo
share/fvwm/locale/sv_SE/
share/fvwm/locale/sv_SE/LC_MESSAGES/
share/fvwm/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
share/fvwm/locale/sv_SE/LC_MESSAGES/fvwm.mo
share/fvwm/locale/zh_CN/
share/fvwm/locale/zh_CN/LC_MESSAGES/
share/fvwm/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
share/fvwm/locale/zh_CN/LC_MESSAGES/fvwm.mo
share/fvwm/perllib/
share/fvwm/perllib/FVWM/
share/fvwm/perllib/FVWM/Commands.pm
@ -154,21 +185,3 @@ share/fvwm/perllib/FVWM/Tracker/WindowList.pm
share/fvwm/perllib/General/
share/fvwm/perllib/General/FileSystem.pm
share/fvwm/perllib/General/Parse.pm
share/locale/ar/LC_MESSAGES/FvwmScript.mo
share/locale/ar/LC_MESSAGES/fvwm.mo
share/locale/da/LC_MESSAGES/FvwmScript.mo
share/locale/da/LC_MESSAGES/fvwm.mo
share/locale/de/LC_MESSAGES/FvwmScript.mo
share/locale/de/LC_MESSAGES/fvwm.mo
share/locale/es/LC_MESSAGES/FvwmScript.mo
share/locale/es/LC_MESSAGES/fvwm.mo
share/locale/fr/LC_MESSAGES/FvwmScript.mo
share/locale/fr/LC_MESSAGES/fvwm.mo
share/locale/ru/LC_MESSAGES/FvwmScript.mo
share/locale/ru/LC_MESSAGES/fvwm.mo
share/locale/sv_SE/
share/locale/sv_SE/LC_MESSAGES/
share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
share/locale/sv_SE/LC_MESSAGES/fvwm.mo
share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
share/locale/zh_CN/LC_MESSAGES/fvwm.mo