Hello Stuart,
thanks for the feedback.
On Thu, Dec 03, 2020 at 04:24:02PM +0000, Stuart Henderson wrote:
> > [...]
>
> that would probably be better done as x11/fvwm3
Right, that was my thought as well.
>
> > I would also like to add pledge() to the most common modules, but I
> > assume this should better be done with an extra patch and therefore is
> > not included here.
>
> btw: pledge can be quite a pain when you're dealing with libraries
> from ports - it can be done if the programs and libraries involved are
> simple, but you can't expect somebody updating a library to figure out
> all the possible interactions with pledge that might occur due to the
> update.
My plan was to focus only on fvwm itself and the most common modules
like FvwmButtons and FvwmPager. I do not know how sensible touching
other modules is, especially since maintaining all those patches over
future updates is probably a some work. Another question then is if
having a port with only partial pledge() support makes sense at all.
>
> > Notable changes:
> > * Project moved to github
> > * Updated DESCR
> > * Removed multipackage since the icon package is gone
> ...
> > +@conflict fvwm2-*
>
> you don't want this ^^
>
> > +@conflict fvwm95-*
>
> and this is long dead
>
> > +@conflict fvwm2+fvicons-*
> > +@conflict fvicons-*
>
> those two are ok
>
> you're also missing these
>
> @pkgpath x11/fvwm2,-main
> @pkgpath x11/fvwm2,-fvicons
> @pkgpath x11/fvwm2,-fvwm2
>
> and these in quirks $stem_extensions
>
> 'fvwm2+fvicons' => 'fvwm2',
> 'fvicons' => 'fvwm2',
>
> to test the update path, fix the above and build packages including a
> new quirks package. move those package files to a directory on their own.
> install the old package/s from a snapshot and point pkg_add at them:
>
> PKG_PATH=/tmp/fvwmpkgs pkg_add -D unsigned -ui
>
> test with the various versions of the old package.
>
> (the old stuff was a complicated set of alternatives, more akin to
> what FLAVORS would do, they aren't a typical multipackage).
>
Thanks. I have removed the mentioned @conflict lines and added the
@pkgpath lines. After adding the above lines to quirks and installing
it, updating from the respective older fvwm2 packages was successful for
each one. I assume I do not need to supply a patch for devel/quirks?
Below is the updated patch for x11/fvwm2:
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fvwm2/Makefile,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 Makefile
--- Makefile 12 Jul 2019 20:51:11 -0000 1.67
+++ Makefile 3 Dec 2020 19:20:28 -0000
@@ -1,39 +1,34 @@
# $OpenBSD: Makefile,v 1.67 2019/07/12 20:51:11 sthen Exp $
-COMMENT-main= multiple virtual desktop window manager, with icons
-COMMENT-fvicons=multiple virtual desktop window manager icons
-COMMENT-fvwm2= multiple virtual desktop window manager, without icons
+COMMENT= multiple virtual desktop window manager
-VERSION= 2.6.5
+VERSION= 2.6.7
DISTNAME= fvwm-${VERSION}
-PKGNAME-main= fvwm2+fvicons-${VERSION}
-FULLPKGNAME-fvicons=fvicons-${VERSION}
-PKGNAME-fvwm2= fvwm2-${VERSION}
-REVISION= 6
+PKGNAME= fvwm2-${VERSION}
CATEGORIES= x11
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons-20070101.tar.gz
+HOMEPAGE= https://www.fvwm.org/
-HOMEPAGE= http://www.fvwm.org/
+MAINTAINER= Michael <michi+openbsd@dataswamp.org>
# GPL/BSD-like (badly worded)
PERMIT_PACKAGE= Yes
+MASTER_SITES= https://github.com/fvwmorg/fvwm/releases/download/${VERSION}/
+
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+
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
-MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/
-
LIB_DEPENDS+= graphics/png \
x11/gnome/librsvg
BUILD_DEPENDS= textproc/libxslt
-MULTI_PACKAGES= -main -fvwm2 -fvicons
-
FLAVORS= debug
FLAVOR?=
@@ -41,15 +36,10 @@ FLAVOR?=
CONFIGURE_ARGS+= --enable-debug-msgs
.endif
-PKG_ARCH-fvicons= *
-LIB_DEPENDS-fvicons=
-WANTLIB-fvicons=
-FULLPKGPATH-fvicons= ${PKGPATH},-fvicons
-
SUBST_VARS= VERSION
-SEPARATE_BUILD= Yes
-CONFIGURE_STYLE= gnu
+SEPARATE_BUILD= Yes
+CONFIGURE_STYLE=gnu
CONFIGURE_ARGS += --disable-bidi \
--disable-gtk \
--without-gnome \
@@ -57,10 +47,5 @@ CONFIGURE_ARGS += --disable-bidi \
--without-stroke-library
CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-
-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
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fvwm2/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo 18 Jan 2015 03:15:53 -0000 1.14
+++ distinfo 3 Dec 2020 19:20:28 -0000
@@ -1,4 +1,2 @@
-SHA256 (fvwm-2.6.5.tar.gz) = 8B+dqAdoUvjbEU+Q8rB1jCHSZeKVj84EKJ5Be866EtE=
-SHA256 (fvwm_icons-20070101.tar.gz) = oL5qSSCzjVj/7+QwdYvB2QEtfHSrZWDL1udYpb3q6yw=
-SIZE (fvwm-2.6.5.tar.gz) = 3449177
-SIZE (fvwm_icons-20070101.tar.gz) = 363286
+SHA256 (fvwm-2.6.7.tar.gz) = AWVNWr3N5trBMcrpvv5c9vAfn3Uk0JfDsPMW45+E73M=
+SIZE (fvwm-2.6.7.tar.gz) = 3934327
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 -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 3 Dec 2020 19:20:28 -0000
@@ -1,12 +1,14 @@
-$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
+$OpenBSD$
+
+Index: bin/Makefile.in
+--- bin/Makefile.in.orig
++++ bin/Makefile.in
+@@ -824,14 +824,13 @@ info: info-am
info-am:
--install-data-am: install-data-local install-man
-+install-data-am: install-man
+-install-data-am: install-configDATA install-data-local install-man
++install-data-am: install-configDATA 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