diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index 4504cf835fa8..fd1494ba98d7 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.140 2023/07/17 22:00:25 nia Exp $ +# $NetBSD: Makefile,v 1.141 2023/08/09 17:46:26 adam Exp $ -DISTNAME= WindowMaker-0.95.9 +DISTNAME= WindowMaker-0.96.0 PKGNAME= ${DISTNAME:tl} -PKGREVISION= 9 CATEGORIES= wm windowmaker -MASTER_SITES= https://windowmaker.org/pub/source/release/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=window-maker/} +GITHUB_PROJECT= wmaker +GITHUB_RELEASE= wmaker-${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.windowmaker.org/ @@ -15,14 +16,14 @@ BROKEN_GETTEXT_DETECTION= yes USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= msgfmt perl:run pkg-config xgettext +USE_TOOLS+= gmake msgfmt perl:run pkg-config xgettext GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-magick CONFIGURE_ARGS+= --enable-pango CONFIGURE_ARGS+= --enable-usermenu CONFIGURE_ARGS+= --enable-xinerama CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} -CONFIGURE_ARGS+= --with-defsdatadir=${PREFIX}/share/examples/WindowMaker +CONFIGURE_ARGS+= --with-pkgconfdir=${PREFIX}/share/examples/WindowMaker CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX}/share/GNUstep CONFIGURE_ENV+= LINGUAS="bg ca cs cz da de el es et fi fr gl he hr hu it ja ko nl ms no pl pt ro ru se sk sl sv tr zh_CN zh_TW" CONFIGURE_ENV+= CPP_PATH=${CPP:Q} @@ -40,7 +41,7 @@ PKGCONFIG_OVERRIDE_STAGE= post-build .include "../../mk/compiler.mk" -.if !empty(MACHINE_PLATFORM:MSunOS-5.11-*) +.if ${MACHINE_PLATFORM:MSunOS-5.11-*} CONFIGURE_ENV+= ac_cv_lib_Xext_XineramaGetInfo=no .endif diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST index 9f7c5ad4d502..4f6c82578b42 100644 --- a/wm/windowmaker/PLIST +++ b/wm/windowmaker/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2020/04/11 07:02:34 adam Exp $ +@comment $NetBSD: PLIST,v 1.24 2023/08/09 17:46:26 adam Exp $ bin/convertfonts bin/geticonset bin/getstyle @@ -89,6 +89,7 @@ share/GNUstep/Applications/WPrefs.app/tiff/drawer.tiff share/GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff share/GNUstep/Applications/WPrefs.app/tiff/expert.tiff share/GNUstep/Applications/WPrefs.app/tiff/fonts.tiff +share/GNUstep/Applications/WPrefs.app/tiff/hotcorners.tiff share/GNUstep/Applications/WPrefs.app/tiff/iconprefs.tiff share/GNUstep/Applications/WPrefs.app/tiff/keyboard.tiff share/GNUstep/Applications/WPrefs.app/tiff/keyboardprefs.tiff @@ -330,6 +331,7 @@ share/WindowMaker/plmenu.sk share/WindowMaker/plmenu.zh_CN share/WindowMaker/plmenu.zh_TW share/WindowMaker/wmmacros +share/applications/WPrefs.desktop share/examples/WindowMaker/WMGLOBAL share/examples/WindowMaker/WMRootMenu share/examples/WindowMaker/WMState @@ -359,6 +361,7 @@ share/locale/fi/LC_MESSAGES/WPrefs.mo share/locale/fi/LC_MESSAGES/WindowMaker.mo share/locale/fr/LC_MESSAGES/WINGs.mo share/locale/fr/LC_MESSAGES/WPrefs.mo +share/locale/fr/LC_MESSAGES/WRaster.mo share/locale/fr/LC_MESSAGES/WindowMaker.mo share/locale/fr/LC_MESSAGES/wmgenmenu.mo share/locale/gl/LC_MESSAGES/WindowMaker.mo @@ -390,8 +393,10 @@ share/locale/sk/LC_MESSAGES/WINGs.mo share/locale/sk/LC_MESSAGES/WPrefs.mo share/locale/sk/LC_MESSAGES/WindowMaker.mo share/locale/sv/LC_MESSAGES/WindowMaker.mo +share/locale/tr/LC_MESSAGES/WPrefs.mo share/locale/tr/LC_MESSAGES/WindowMaker.mo share/locale/zh_CN/LC_MESSAGES/WPrefs.mo share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo share/locale/zh_TW/LC_MESSAGES/WPrefs.mo share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo +share/xsessions/wmaker.desktop diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo index c187830e772a..343f0f28d800 100644 --- a/wm/windowmaker/distinfo +++ b/wm/windowmaker/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.47 2021/10/26 11:25:20 nia Exp $ +$NetBSD: distinfo,v 1.48 2023/08/09 17:46:26 adam Exp $ -BLAKE2s (WindowMaker-0.95.9.tar.gz) = 9227cb50d1cfc8db626a4ff3e2a1ab43528ba1b74418274eded013573429c321 -SHA512 (WindowMaker-0.95.9.tar.gz) = ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584 -Size (WindowMaker-0.95.9.tar.gz) = 3397167 bytes +BLAKE2s (WindowMaker-0.96.0.tar.gz) = 90ce5a28e7c6046f4f9e668d33295d29420da4ad8441f49915d36b4ae2164166 +SHA512 (WindowMaker-0.96.0.tar.gz) = cca1796722803922aa28ea20534f10566b594b7a69eba8c1da6bd1305654583f39ef67f10fd6a550730714e728d876f807aee50968e9392190bb9dc7ffe8409a +Size (WindowMaker-0.96.0.tar.gz) = 3443048 bytes SHA1 (patch-WINGs_dragsource.c) = a9b8dfb0ac453e5835b683a2119428d0b1182ced +SHA1 (patch-configure) = f63303da4f08601dc18652a10a8e4bcf355fcc5f SHA1 (patch-src_event.c) = 9f72b77f7f7890c9b4283eecca3e2bb25ad8d5b3 SHA1 (patch-src_main.c) = e1693470d803b96f8ff93906dfeea43d5c3509c9 SHA1 (patch-src_switchpanel.c) = 4c494eff64b17bf4b08ddaafc95ffa37f43452f9 -SHA1 (patch-util_Makefile.in) = 066a9e54b4b4f7be6415259b737c85171f9aa548 -SHA1 (patch-wrlib_Makefile.in) = a7a5f601219c1fe8f7f0273a2a1518ab0d8e99b2 +SHA1 (patch-util_Makefile.in) = 9f44e204779d4756ac333799795ad046223dc153 +SHA1 (patch-wrlib_Makefile.in) = 023ca249c924675e313863c8d389146bd7ace815 diff --git a/wm/windowmaker/hacks.mk b/wm/windowmaker/hacks.mk index a688966805de..29aa0d4fefe1 100644 --- a/wm/windowmaker/hacks.mk +++ b/wm/windowmaker/hacks.mk @@ -1,7 +1,7 @@ -# $NetBSD: hacks.mk,v 1.1 2007/06/21 00:58:04 minskim Exp $ +# $NetBSD: hacks.mk,v 1.2 2023/08/09 17:46:26 adam Exp $ # Disable inline assembly on i386 until GCC Bug #25221 is fixed. # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25221 -.if !empty(CC_VERSION:Mgcc-4.*) +.if ${CC_VERSION:Mgcc-4.*} CONFIGURE_ENV+= ac_cv_c_inline_asm=no .endif diff --git a/wm/windowmaker/patches/patch-configure b/wm/windowmaker/patches/patch-configure new file mode 100644 index 000000000000..5c030df06186 --- /dev/null +++ b/wm/windowmaker/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.3 2023/08/09 17:46:26 adam Exp $ + +Portability fix. + +--- configure.orig 2023-08-09 13:37:32.937296703 +0000 ++++ configure +@@ -19143,7 +19143,7 @@ printf "%s\n" "#define USE_PANGO 1" >>co + + pango="yes" + fi +- if test "x$enable_pango$pango" == "xyesno" ++ if test "x$enable_pango$pango" = "xyesno" + then : + as_fn_error $? "Pango library was not found - $PANGO_PKG_ERRORS" "$LINENO" 5 + fi diff --git a/wm/windowmaker/patches/patch-util_Makefile.in b/wm/windowmaker/patches/patch-util_Makefile.in index 678d9f90c6e1..6f9fbb9322af 100644 --- a/wm/windowmaker/patches/patch-util_Makefile.in +++ b/wm/windowmaker/patches/patch-util_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-util_Makefile.in,v 1.1 2015/10/16 10:42:23 adam Exp $ +$NetBSD: patch-util_Makefile.in,v 1.2 2023/08/09 17:46:26 adam Exp $ ---- util/Makefile.in.orig 2015-08-11 18:52:20.000000000 +0000 +--- util/Makefile.in.orig 2023-08-07 12:52:47.000000000 +0000 +++ util/Makefile.in -@@ -482,21 +482,21 @@ AM_CPPFLAGS = \ +@@ -515,21 +515,21 @@ AM_CPPFLAGS = \ -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\" liblist = @LIBRARY_SEARCH_PATH@ @INTLIBS@ @@ -10,7 +10,7 @@ $NetBSD: patch-util_Makefile.in,v 1.1 2015/10/16 10:42:23 adam Exp $ -wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) +wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) +wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) - wxcopy_LDADD = @XLFLAGS@ @XLIBS@ + wxcopy_LDADD = @XLFLAGS@ @XLIBS@ wxpaste_LDADD = @XLFLAGS@ @XLIBS@ -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist) diff --git a/wm/windowmaker/patches/patch-wrlib_Makefile.in b/wm/windowmaker/patches/patch-wrlib_Makefile.in index 202514826f9e..53a2dea8b7db 100644 --- a/wm/windowmaker/patches/patch-wrlib_Makefile.in +++ b/wm/windowmaker/patches/patch-wrlib_Makefile.in @@ -1,13 +1,13 @@ -$NetBSD: patch-wrlib_Makefile.in,v 1.1 2015/10/16 10:42:23 adam Exp $ +$NetBSD: patch-wrlib_Makefile.in,v 1.2 2023/08/09 17:46:26 adam Exp $ ---- wrlib/Makefile.in.orig 2015-08-11 18:52:20.000000000 +0000 +--- wrlib/Makefile.in.orig 2023-08-07 12:52:47.000000000 +0000 +++ wrlib/Makefile.in -@@ -447,7 +447,7 @@ DIST_SUBDIRS = $(SUBDIRS) tests +@@ -483,7 +483,7 @@ DIST_SUBDIRS = $(SUBDIRS) tests AUTOMAKE_OPTIONS = - EXTRA_DIST = tests + EXTRA_DIST = tests wraster.h.in lib_LTLIBRARIES = libwraster.la -libwraster_la_LDFLAGS = -version-info @WRASTER_VERSION@ \ +libwraster_la_LDFLAGS = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm -version-info @WRASTER_VERSION@ \ $(am__append_1) + CLEANFILES = wraster.h $(am__append_2) @HAVE_LD_VERSION_SCRIPT_TRUE@EXTRA_libwraster_la_DEPENDENCIES = libwraster.map - @HAVE_LD_VERSION_SCRIPT_TRUE@CLEANFILES = libwraster.map