From ef58f291333002a83383816be6da98b36d9fa3f7 Mon Sep 17 00:00:00 2001 From: Felix Palmen Date: Sat, 25 Sep 2021 12:47:30 +0200 Subject: [PATCH] x11-wm/fvwm3: update to 1.0.4 Add option GO to build/install the FvwmPrompt module written in Go. --- x11-wm/fvwm3/Makefile | 33 +++++++++--------- x11-wm/fvwm3/distinfo | 6 ++-- x11-wm/fvwm3/pkg-plist | 77 ++++++++++++++++++++---------------------- 3 files changed, 56 insertions(+), 60 deletions(-) diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile index 643276659299..2060c17d2292 100644 --- a/x11-wm/fvwm3/Makefile +++ b/x11-wm/fvwm3/Makefile @@ -1,7 +1,7 @@ # Created by: Felix Palmen PORTNAME= fvwm3 -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.4 CATEGORIES= x11-wm MASTER_SITES= https://github.com/fvwmorg/fvwm3/releases/download/${PORTVERSION}/ \ http://fvwm.sourceforge.net/generated/icon_download/:icons @@ -13,28 +13,36 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libbson-1.0.so:devel/libbson \ - libevent.so:devel/libevent + libevent.so:devel/libevent \ + libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig USES= compiler:c11 cpe pkgconfig python:3.7+ readline xorg -USE_XORG= ice x11 xext xrandr xrender xt +USE_XORG= ice sm x11 xext xft xrandr xrender xt CONFLICTS_INSTALL= fvwm-2.* CPE_VENDOR= fvwm CPE_PRODUCT= fvwm +PLIST_SUB= PORTVERSION=${PORTVERSION} + GNU_CONFIGURE= yes -CONFIGURE_ARGS= ac_cv_path_PYTHON=${PYTHON_CMD} \ - --disable-golang +CONFIGURE_ARGS= ac_cv_path_PYTHON=${PYTHON_CMD} -OPTIONS_DEFINE= FRIBIDI ICONS ICONV MANPAGES NLS PERL PNG SVG \ - XCURSOR XFT XPM XSM -OPTIONS_DEFAULT= FRIBIDI ICONV MANPAGES PERL PNG XCURSOR XFT XSM +OPTIONS_DEFINE= FRIBIDI GO ICONS ICONV MANPAGES NLS PERL PNG SVG \ + XCURSOR XPM +OPTIONS_DEFAULT= FRIBIDI GO ICONV MANPAGES PERL PNG XCURSOR OPTIONS_SUB= yes FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi FRIBIDI_CONFIGURE_ENABLE= bidi +GO_DESC= Build and install modules written in Go +GO_USES= go:no_targets +GO_CONFIGURE_ENABLE= golang +GO_MAKE_ARGS= GOBUILD="go build -ldflags=\"-s -w\"" + FVWM_ICONS= fvwm_icons-20070101 ICONS_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${FVWM_ICONS}.tar.bz2:icons ICONS_IMPLIES= XPM @@ -64,18 +72,9 @@ SVG_CONFIGURE_ENABLE= rsvg XCURSOR_USE= xorg=xcursor XCURSOR_CONFIGURE_ENABLE= xcursor -XFT_LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig -XFT_USE= xorg=xft -XFT_CONFIGURE_ENABLE= xft - XPM_USE= xorg=xpm XPM_CONFIGURE_OFF= --with-xpm-library=no -XSM_DESC= X11 session management support -XSM_USE= xorg=sm -XSM_CONFIGURE_ENABLE= sm - post-patch: @${REINPLACE_CMD} -e 's,/etc/,${LOCALBASE}/etc/,g' \ ${WRKSRC}/bin/fvwm-menu-desktop.in diff --git a/x11-wm/fvwm3/distinfo b/x11-wm/fvwm3/distinfo index e1596063add6..8e85bc9ef20c 100644 --- a/x11-wm/fvwm3/distinfo +++ b/x11-wm/fvwm3/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1620389698 -SHA256 (fvwm3-1.0.2.tar.gz) = aa5597fe98fcfadebf936b491497d96e81b07a39a9fa93b590592bf2bf9b8a2f -SIZE (fvwm3-1.0.2.tar.gz) = 5449378 +TIMESTAMP = 1632559997 +SHA256 (fvwm3-1.0.4.tar.gz) = 20877e20ae5ce39266e7d0ea48b013e822d600dd94f5b269955db05a3d50a63b +SIZE (fvwm3-1.0.4.tar.gz) = 4691719 SHA256 (fvwm_icons-20070101.tar.bz2) = 86b0164430a3087f5cb8d55eb43a8676bbce495814b30c6844eb127f952642ab SIZE (fvwm_icons-20070101.tar.bz2) = 330862 diff --git a/x11-wm/fvwm3/pkg-plist b/x11-wm/fvwm3/pkg-plist index 7c8b76073c1b..a996eb27a1d6 100644 --- a/x11-wm/fvwm3/pkg-plist +++ b/x11-wm/fvwm3/pkg-plist @@ -1,4 +1,5 @@ bin/FvwmCommand +%%GO%%bin/FvwmPrompt bin/fvwm-config %%PERL%%bin/fvwm-convert-2.6 bin/fvwm-menu-desktop @@ -7,32 +8,29 @@ bin/fvwm-menu-desktop %%PERL%%bin/fvwm-perllib bin/fvwm-root bin/fvwm3 -bin/xpmroot -libexec/fvwm3/1.0.2/FvwmAnimate -libexec/fvwm3/1.0.2/FvwmAuto -libexec/fvwm3/1.0.2/FvwmBacker -libexec/fvwm3/1.0.2/FvwmButtons -libexec/fvwm3/1.0.2/FvwmCascade -libexec/fvwm3/1.0.2/FvwmConsole -libexec/fvwm3/1.0.2/FvwmConsoleC -%%PERL%%libexec/fvwm3/1.0.2/FvwmConsoleC.pl -libexec/fvwm3/1.0.2/FvwmEvent -libexec/fvwm3/1.0.2/FvwmForm -libexec/fvwm3/1.0.2/FvwmIconMan -libexec/fvwm3/1.0.2/FvwmIdent -libexec/fvwm3/1.0.2/FvwmMFL -libexec/fvwm3/1.0.2/FvwmPager -%%PERL%%libexec/fvwm3/1.0.2/FvwmPerl -libexec/fvwm3/1.0.2/FvwmRearrange -libexec/fvwm3/1.0.2/FvwmScript -libexec/fvwm3/1.0.2/FvwmTalk -libexec/fvwm3/1.0.2/FvwmTile +libexec/fvwm3/%%PORTVERSION%%/FvwmAnimate +libexec/fvwm3/%%PORTVERSION%%/FvwmAuto +libexec/fvwm3/%%PORTVERSION%%/FvwmBacker +libexec/fvwm3/%%PORTVERSION%%/FvwmButtons +%%GO%%libexec/fvwm3/%%PORTVERSION%%/FvwmCommandS +%%NO_GO%%libexec/fvwm3/%%PORTVERSION%%/FvwmConsole +%%NO_GO%%libexec/fvwm3/%%PORTVERSION%%/FvwmConsoleC +libexec/fvwm3/%%PORTVERSION%%/FvwmEvent +libexec/fvwm3/%%PORTVERSION%%/FvwmForm +libexec/fvwm3/%%PORTVERSION%%/FvwmIconMan +libexec/fvwm3/%%PORTVERSION%%/FvwmIdent +libexec/fvwm3/%%PORTVERSION%%/FvwmMFL +libexec/fvwm3/%%PORTVERSION%%/FvwmPager +%%PERL%%libexec/fvwm3/%%PORTVERSION%%/FvwmPerl +libexec/fvwm3/%%PORTVERSION%%/FvwmRearrange +libexec/fvwm3/%%PORTVERSION%%/FvwmScript +libexec/fvwm3/%%PORTVERSION%%/FvwmTalk %%MANPAGES%%man/man1/FvwmAnimate.1.gz %%MANPAGES%%man/man1/FvwmAuto.1.gz %%MANPAGES%%man/man1/FvwmBacker.1.gz %%MANPAGES%%man/man1/FvwmButtons.1.gz +%%MANPAGES%%%%GO%%man/man1/FvwmCommand.1.gz %%MANPAGES%%man/man1/FvwmConsole.1.gz -%%MANPAGES%%man/man1/FvwmConsoleC.pl.1.gz %%MANPAGES%%man/man1/FvwmEvent.1.gz %%MANPAGES%%man/man1/FvwmForm.1.gz %%MANPAGES%%man/man1/FvwmIconMan.1.gz @@ -43,15 +41,14 @@ libexec/fvwm3/1.0.2/FvwmTile %%MANPAGES%%man/man1/FvwmPrompt.1.gz %%MANPAGES%%man/man1/FvwmRearrange.1.gz %%MANPAGES%%man/man1/FvwmScript.1.gz -%%MANPAGES%%man/man1/fvwm-config-2.6.1.gz %%MANPAGES%%man/man1/fvwm-config.1.gz +%%MANPAGES%%man/man1/fvwm-convert-2.6.1.gz %%MANPAGES%%man/man1/fvwm-menu-desktop.1.gz %%MANPAGES%%man/man1/fvwm-menu-directory.1.gz %%MANPAGES%%man/man1/fvwm-menu-xlock.1.gz %%MANPAGES%%man/man1/fvwm-perllib.1.gz %%MANPAGES%%man/man1/fvwm-root.1.gz %%MANPAGES%%man/man1/fvwm3.1.gz -%%MANPAGES%%man/man1/xpmroot.1.gz %%DATADIR%%/ConfigFvwmBacker %%DATADIR%%/ConfigFvwmButtons %%DATADIR%%/ConfigFvwmDefaults @@ -105,6 +102,7 @@ libexec/fvwm3/1.0.2/FvwmTile %%DATADIR%%/default-config/images/icons/quit.png %%DATADIR%%/default-config/images/icons/refresh.png %%DATADIR%%/default-config/images/icons/restart.png +%%DATADIR%%/default-config/images/icons/run_arrow.png %%DATADIR%%/default-config/images/icons/terminal.png %%DATADIR%%/default-config/images/icons/wallpaper.png %%DATADIR%%/default-config/images/icons/win/bottom.png @@ -131,7 +129,6 @@ libexec/fvwm3/1.0.2/FvwmTile %%PERL%%%%DATADIR%%/perllib/FVWM/EventNames.pm %%PERL%%%%DATADIR%%/perllib/FVWM/Module.pm %%PERL%%%%DATADIR%%/perllib/FVWM/Module/Terminal.pm -%%PERL%%%%DATADIR%%/perllib/FVWM/Module/Tk.pm %%PERL%%%%DATADIR%%/perllib/FVWM/Module/Toolkit.pm %%PERL%%%%DATADIR%%/perllib/FVWM/Tracker.pm %%PERL%%%%DATADIR%%/perllib/FVWM/Tracker/Colorsets.pm @@ -458,19 +455,19 @@ libexec/fvwm3/1.0.2/FvwmTile %%ICONS%%%%DATADIR%%/pixmaps/xv.xpm %%ICONS%%%%DATADIR%%/pixmaps/xv2.xpm %%ICONS%%%%DATADIR%%/pixmaps/xview.xpm -%%NLS%%share/locale/ar/LC_MESSAGES/FvwmScript.mo -%%NLS%%share/locale/ar/LC_MESSAGES/fvwm.mo -%%NLS%%share/locale/da/LC_MESSAGES/FvwmScript.mo -%%NLS%%share/locale/da/LC_MESSAGES/fvwm.mo -%%NLS%%share/locale/de/LC_MESSAGES/FvwmScript.mo -%%NLS%%share/locale/de/LC_MESSAGES/fvwm.mo -%%NLS%%share/locale/es/LC_MESSAGES/FvwmScript.mo -%%NLS%%share/locale/es/LC_MESSAGES/fvwm.mo -%%NLS%%share/locale/fr/LC_MESSAGES/FvwmScript.mo -%%NLS%%share/locale/fr/LC_MESSAGES/fvwm.mo -%%NLS%%share/locale/ru/LC_MESSAGES/FvwmScript.mo -%%NLS%%share/locale/ru/LC_MESSAGES/fvwm.mo -%%NLS%%share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo -%%NLS%%share/locale/sv_SE/LC_MESSAGES/fvwm.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/fvwm.mo +%%NLS%%%%DATADIR%%/locale/ar/LC_MESSAGES/FvwmScript.mo +%%NLS%%%%DATADIR%%/locale/ar/LC_MESSAGES/fvwm.mo +%%NLS%%%%DATADIR%%/locale/da/LC_MESSAGES/FvwmScript.mo +%%NLS%%%%DATADIR%%/locale/da/LC_MESSAGES/fvwm.mo +%%NLS%%%%DATADIR%%/locale/de/LC_MESSAGES/FvwmScript.mo +%%NLS%%%%DATADIR%%/locale/de/LC_MESSAGES/fvwm.mo +%%NLS%%%%DATADIR%%/locale/es/LC_MESSAGES/FvwmScript.mo +%%NLS%%%%DATADIR%%/locale/es/LC_MESSAGES/fvwm.mo +%%NLS%%%%DATADIR%%/locale/fr/LC_MESSAGES/FvwmScript.mo +%%NLS%%%%DATADIR%%/locale/fr/LC_MESSAGES/fvwm.mo +%%NLS%%%%DATADIR%%/locale/ru/LC_MESSAGES/FvwmScript.mo +%%NLS%%%%DATADIR%%/locale/ru/LC_MESSAGES/fvwm.mo +%%NLS%%%%DATADIR%%/locale/sv_SE/LC_MESSAGES/FvwmScript.mo +%%NLS%%%%DATADIR%%/locale/sv_SE/LC_MESSAGES/fvwm.mo +%%NLS%%%%DATADIR%%/locale/zh_CN/LC_MESSAGES/FvwmScript.mo +%%NLS%%%%DATADIR%%/locale/zh_CN/LC_MESSAGES/fvwm.mo -- 2.32.0