CVS commit: pkgsrc/www/deforaos-surfer

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Tue Nov 15 18:27:53 UTC 2022

Modified Files:
        pkgsrc/www/deforaos-surfer: Makefile PLIST distinfo options.mk

Log Message:
deforaos-surfer: update to 0.3.1

This new release contains:

* Port to the WebKit2 API (the default)
* Removal of download(1) with the WebKit2 API (could not be ported yet)
* Additional documentation
* Renaming of the XDG desktop files

This also makes use of the helper for DeforaOS configure, found in
devel/deforaos-configure/deforaos-configure.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/www/deforaos-surfer/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/deforaos-surfer/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/deforaos-surfer/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/deforaos-surfer/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/deforaos-surfer/Makefile
diff -u pkgsrc/www/deforaos-surfer/Makefile:1.64 pkgsrc/www/deforaos-surfer/Makefile:1.65
--- pkgsrc/www/deforaos-surfer/Makefile:1.64    Thu Aug 11 05:09:22 2022
+++ pkgsrc/www/deforaos-surfer/Makefile Tue Nov 15 18:27:53 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2022/08/11 05:09:22 gutteridge Exp $
+# $NetBSD: Makefile,v 1.65 2022/11/15 18:27:53 khorben Exp $
 
-DISTNAME=      Surfer-0.3.0
-PKGNAME=       deforaos-surfer-0.3.0
-PKGREVISION=   11
+DISTNAME=      Surfer-0.3.1
+PKGNAME=       deforaos-surfer-0.3.1
 CATEGORIES=    www
 MASTER_SITES=  https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Surfer/
 
@@ -29,14 +28,10 @@ AUTO_MKDIRS=        yes
 
 .if ${PKGMANDIR} != "share/man"
 post-install:
-       ${MV} ${DESTDIR}${PREFIX}/share/man/html1/download.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/download.html
-       ${MV} ${DESTDIR}${PREFIX}/share/man/html1/htmlapp.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/htmlapp.html
-       ${MV} ${DESTDIR}${PREFIX}/share/man/html1/helper.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/helper.html
-       ${MV} ${DESTDIR}${PREFIX}/share/man/html1/surfer.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/surfer.html
-       ${MV} ${DESTDIR}${PREFIX}/share/man/man1/download.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/download.1
-       ${MV} ${DESTDIR}${PREFIX}/share/man/man1/helper.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/helper.1
-       ${MV} ${DESTDIR}${PREFIX}/share/man/man1/htmlapp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/htmlapp.1
-       ${MV} ${DESTDIR}${PREFIX}/share/man/man1/surfer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/surfer.1
+. for page in download helper htmlapp surfer
+       ${MV} ${DESTDIR}${PREFIX}/share/man/html1/${page}.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/${page}.html
+       ${MV} ${DESTDIR}${PREFIX}/share/man/man1/${page}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${page}.1
+. endfor
        ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
        ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
        ${RMDIR} ${DESTDIR}${PREFIX}/share/man
@@ -44,8 +39,9 @@ post-install:
 
 .include "options.mk"
 
+.include "../../devel/deforaos-configure/deforaos-configure.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../www/webkit24-gtk3/buildlink3.mk"
+.include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/deforaos-surfer/PLIST
diff -u pkgsrc/www/deforaos-surfer/PLIST:1.3 pkgsrc/www/deforaos-surfer/PLIST:1.4
--- pkgsrc/www/deforaos-surfer/PLIST:1.3        Tue Aug 25 22:47:00 2015
+++ pkgsrc/www/deforaos-surfer/PLIST    Tue Nov 15 18:27:53 2022
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/08/25 22:47:00 khorben Exp $
-bin/download
+@comment $NetBSD: PLIST,v 1.4 2022/11/15 18:27:53 khorben Exp $
 bin/helper
 bin/htmlapp
 bin/surfer
@@ -11,9 +10,11 @@ man/man1/download.1
 man/man1/helper.1
 man/man1/htmlapp.1
 man/man1/surfer.1
-share/applications/deforaos-helper.desktop
-share/applications/deforaos-htmlapp.desktop
-share/applications/deforaos-surfer.desktop
+share/applications/org.defora.helper.desktop
+share/applications/org.defora.htmlapp.desktop
+share/applications/org.defora.surfer.desktop
+share/doc/Surfer/COPYING
+share/doc/Surfer/README.md
 share/icons/hicolor/16x16/apps/surfer-view-html-source.png
 share/icons/hicolor/24x24/apps/surfer-view-html-source.png
 share/locale/de/LC_MESSAGES/Surfer.mo

Index: pkgsrc/www/deforaos-surfer/distinfo
diff -u pkgsrc/www/deforaos-surfer/distinfo:1.11 pkgsrc/www/deforaos-surfer/distinfo:1.12
--- pkgsrc/www/deforaos-surfer/distinfo:1.11    Tue Oct 26 11:29:24 2021
+++ pkgsrc/www/deforaos-surfer/distinfo Tue Nov 15 18:27:53 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 11:29:24 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/11/15 18:27:53 khorben Exp $
 
-BLAKE2s (Surfer-0.3.0.tar.gz) = 32bcbfa1a40305f43233ed939cb88a2abe17070fd2cc88ff0b74312b6e049e98
-SHA512 (Surfer-0.3.0.tar.gz) = 4e80d4a5e2ead415dbbb97a1bc5977fb2a64c85b420d12d4daa5cf17fd59f214de8b1919cf733330bbd6ef4abe16b828003a65b85393c2a5e1b02665168e6c9c
-Size (Surfer-0.3.0.tar.gz) = 100740 bytes
+BLAKE2s (Surfer-0.3.1.tar.gz) = 128d62b6b0fcbeea8d303ca77a84441b9193c2ddd1d5977904b8b405159ce3c1
+SHA512 (Surfer-0.3.1.tar.gz) = 5c52f4ce188cacc64f943612ccf75ab203e1b752fb4c1c1b9c636f277eb31efc8f00c5640e885438e2c9cc6728debaa761a7feca9cfd221735a2ed5bcfc5f4eb
+Size (Surfer-0.3.1.tar.gz) = 105578 bytes

Index: pkgsrc/www/deforaos-surfer/options.mk
diff -u pkgsrc/www/deforaos-surfer/options.mk:1.1 pkgsrc/www/deforaos-surfer/options.mk:1.2
--- pkgsrc/www/deforaos-surfer/options.mk:1.1   Mon Dec 17 01:36:28 2012
+++ pkgsrc/www/deforaos-surfer/options.mk       Tue Nov 15 18:27:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2012/12/17 01:36:28 khorben Exp $
+# $NetBSD: options.mk,v 1.2 2022/11/15 18:27:53 khorben Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.deforaos-surfer
 PKG_SUPPORTED_OPTIONS= embedded
@@ -6,5 +6,7 @@ PKG_SUPPORTED_OPTIONS=  embedded
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Membedded)
-MAKE_FLAGS+=   CPPFLAGS=-DEMBEDDED
+DEFORAOS_CONFIGURE_MODE=       embedded-webkit-4-debug
+.else
+DEFORAOS_CONFIGURE_MODE=       webkit-4-debug
 .endif