Hi,
I had this locally and have been running this updated fvwm2 for a bit
without any issues.
A few modules have been removed or wrapped into others, so would
recommend to double-check .fvwm2rc. As before, there is
fvwm-convert-2.6 to help with converting old configs (I haven't tested
it).
A few more points about this update:
- passes make port-lib-depends-check and portcheck without issues
- upstream has moved distfiles to github
- couldn't find a new source for fvicons; use the one from 2.6.5
- upstream distfiles for fvicons are gone and can't find replacement.
Therefore, MASTER_SITES0 set to
https://ftp.openbsd.org/pub/OpenBSD/distfiles/. Or rather remove?
- looks like this is probably the last release for fvwm version 2
comments, ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fvwm2/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile 12 Jul 2019 20:51:11 -0000 1.67
+++ Makefile 10 Apr 2020 05:55:13 -0000
@@ -4,18 +4,19 @@ COMMENT-main= multiple virtual desktop w
COMMENT-fvicons=multiple virtual desktop window manager icons
COMMENT-fvwm2= multiple virtual desktop window manager, without icons
-VERSION= 2.6.5
+VERSION= 2.6.9
DISTNAME= fvwm-${VERSION}
PKGNAME-main= fvwm2+fvicons-${VERSION}
FULLPKGNAME-fvicons=fvicons-${VERSION}
PKGNAME-fvwm2= fvwm2-${VERSION}
-REVISION= 6
CATEGORIES= x11
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons-20070101.tar.gz
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ fvwm_icons-20070101.tar.gz:0
HOMEPAGE= http://www.fvwm.org/
+MAINTAINER= Thomas Frohwein <thfr@openbsd.org>
# GPL/BSD-like (badly worded)
PERMIT_PACKAGE= Yes
@@ -25,7 +26,8 @@ WANTLIB += c cairo curses fontconfig fre
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m png
WANTLIB += readline rsvg-2 z
-MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/
+MASTER_SITES= https://github.com/fvwmorg/fvwm/releases/download/${VERSION}/
+MASTER_SITES0 = https://ftp.openbsd.org/pub/OpenBSD/distfiles/
LIB_DEPENDS+= graphics/png \
x11/gnome/librsvg
@@ -52,6 +54,7 @@ SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS += --disable-bidi \
--disable-gtk \
+ --enable-mandoc \
--without-gnome \
--without-rplay-library \
--without-stroke-library
@@ -60,7 +63,8 @@ CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS} -
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/fvwm
- ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm ${PREFIX}/share/pixmaps/fvwm/
- ${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/share/fvwm
+ ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm \
+ ${PREFIX}/share/pixmaps/fvwm/
+ ${INSTALL_DATA} ${WRKSRC}/default-config/config ${PREFIX}/share/fvwm
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fvwm2/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 18 Jan 2015 03:15:53 -0000 1.14
+++ distinfo 10 Apr 2020 05:55:13 -0000
@@ -1,4 +1,4 @@
-SHA256 (fvwm-2.6.5.tar.gz) = 8B+dqAdoUvjbEU+Q8rB1jCHSZeKVj84EKJ5Be866EtE=
+SHA256 (fvwm-2.6.9.tar.gz) = G8ZM88zQBzAIdYFoMnqCZbgFne+bI5tFHWufqyzDka4=
SHA256 (fvwm_icons-20070101.tar.gz) = oL5qSSCzjVj/7+QwdYvB2QEtfHSrZWDL1udYpb3q6yw=
-SIZE (fvwm-2.6.5.tar.gz) = 3449177
+SIZE (fvwm-2.6.9.tar.gz) = 3942859
SIZE (fvwm_icons-20070101.tar.gz) = 363286
Index: patches/patch-bin_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/fvwm2/patches/patch-bin_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bin_Makefile_in
--- patches/patch-bin_Makefile_in 26 Apr 2011 18:50:46 -0000 1.1
+++ patches/patch-bin_Makefile_in 10 Apr 2020 05:55:13 -0000
@@ -1,11 +1,12 @@
$OpenBSD: patch-bin_Makefile_in,v 1.1 2011/04/26 18:50:46 shadchin Exp $
---- bin/Makefile.in.orig Fri Mar 4 08:47:50 2011
-+++ bin/Makefile.in Fri Mar 4 08:48:13 2011
-@@ -710,14 +710,13 @@ info: info-am
+Index: bin/Makefile.in
+--- bin/Makefile.in.orig
++++ bin/Makefile.in
+@@ -835,14 +835,13 @@ info: info-am
info-am:
--install-data-am: install-data-local install-man
+-install-data-am: install-configDATA install-data-local install-man
+install-data-am: install-man
install-dvi: install-dvi-am
Index: patches/patch-config_h_in
===================================================================
RCS file: patches/patch-config_h_in
diff -N patches/patch-config_h_in
--- patches/patch-config_h_in 26 Apr 2011 18:50:46 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-config_h_in,v 1.2 2011/04/26 18:50:46 shadchin Exp $
---- config.h.in.orig Mon Aug 9 18:30:50 2010
-+++ config.h.in Thu Mar 3 21:36:48 2011
-@@ -558,7 +558,9 @@
- #pragma alloca
- # else
- # ifndef alloca /* predefined by HP cc +Olibcalls */
-+# ifndef __OpenBSD__
- char *alloca ();
-+# endif
- # endif
- # endif
-
No comments:
Post a Comment