edbrowse: Update wip/edbrowse to 3.7.4

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: edbrowse: Update wip/edbrowse to 3.7.4
From: Leonardo Taccari <iamleot%gmail.com@localhost>
Date: Thu, 28 Jun 2018 20:22:41 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <iamleot%gmail.com@localhost>
Pushed By:	leot
Date:		Thu Jun 28 22:22:41 2018 +0200
Changeset:	09824d5c1bbb9c9abe16d8d8cff3f3f85d679322

Modified Files:
	edbrowse/Makefile
	edbrowse/PLIST
	edbrowse/distinfo
Added Files:
	edbrowse/patches/patch-CMakeLists.txt
Removed Files:
	edbrowse/patches/patch-src_http.c

Log Message:
edbrowse: Update wip/edbrowse to 3.7.4

pkgsrc changes:
 - Remove no longer needed patch-src_http.c
 - Avoid to manually install documentation and man page, now it is done via
   cmake (but needed some little adjustments to do that via
   patch-CMakeLists.txt)

Changes:
3.7.4
-----
 - Install man page and other documentation.
 - Search for regular expressions with or without wrap.
 - A uniform and consistent approach to toggle commands:
   foo (toggle), foo+ (enable), foo- (disable).
 - Show or hide all the messages that are produced by hovering over things,
   or injected by css :before {content:foo}
 - The g- command, go but don't browse.
 - The & command backs up through intrapage jumps, just as they ^ command
   backs up through pages on the stack.
 - Imap client uses copy and delete if the server does not support the MOVE
   command.
   Bulk move or delete from one imap folder to another.
   Create, delete, and rename imap folders.
 - Start using the acid tests to exercise edbrowse.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=09824d5c1bbb9c9abe16d8d8cff3f3f85d679322

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

diffstat:
 edbrowse/Makefile                     | 14 +++++------
 edbrowse/PLIST                        |  1 +
 edbrowse/distinfo                     | 10 ++++----
 edbrowse/patches/patch-CMakeLists.txt | 46 +++++++++++++++++++++++++++++++++++
 edbrowse/patches/patch-src_http.c     | 16 ------------
 5 files changed, 58 insertions(+), 29 deletions(-)

diffs:
diff --git a/edbrowse/Makefile b/edbrowse/Makefile
index a7e5ffab71..3833481488 100644
--- a/edbrowse/Makefile
+++ b/edbrowse/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	edbrowse-3.7.3
+DISTNAME=	edbrowse-3.7.4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=CMB/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -22,13 +22,11 @@ SUBST_MESSAGE.man=	Fixing paths in man page
 SUBST_FILES.man=	doc/man-edbrowse-debian.1
 SUBST_SED.man=		-e '/usersguide\.html/ s,/usr,${PREFIX},g'
 
-DOCDIR=			${PREFIX}/share/doc/edbrowse
-INSTALLATION_DIRS+=	${DOCDIR} ${PKGMANDIR}/man1
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/usersguide.html ${DESTDIR}${DOCDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/man-edbrowse-debian.1 \
-	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/edbrowse.1
+SUBST_CLASSES+=			cmakelists
+SUBST_STAGE.cmakelists=		post-patch
+SUBST_MESSAGE.cmakelists=	Fixing paths in CMakeLists.txt
+SUBST_FILES.cmakelists=		CMakeLists.txt
+SUBST_VARS.cmakelists=		PREFIX PKGMANDIR
 
 .include "../../devel/pcre/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libduktape+=	libduktape>=2.1.0
diff --git a/edbrowse/PLIST b/edbrowse/PLIST
index 2ed9c162bd..56dd0598ec 100644
--- a/edbrowse/PLIST
+++ b/edbrowse/PLIST
@@ -1,4 +1,5 @@
 @comment $NetBSD$
 bin/edbrowse
 man/man1/edbrowse.1
+share/doc/edbrowse/sample.ebrc
 share/doc/edbrowse/usersguide.html
diff --git a/edbrowse/distinfo b/edbrowse/distinfo
index 3b651b9b3c..62aabee0a8 100644
--- a/edbrowse/distinfo
+++ b/edbrowse/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (edbrowse-3.7.3.tar.gz) = 0112ff2f034495d756289c8a41d69d9774ee881a
-RMD160 (edbrowse-3.7.3.tar.gz) = 5dbdf07139b809b89e4449a16dff8bb0629d4760
-SHA512 (edbrowse-3.7.3.tar.gz) = fa1ffeb373e9c917652f96e2b19aabe7578537c8d0ccae944ae7d08ede75e7d166cf4417f75551997d8468442844d13a59c6ef301839e07c2e2851cbfa6e52e9
-Size (edbrowse-3.7.3.tar.gz) = 707515 bytes
-SHA1 (patch-src_http.c) = 71fd2662eedfd2d36cafe9588301cfb207c95c7f
+SHA1 (edbrowse-3.7.4.tar.gz) = 774fb0cfbf634b3ac6b5f04924c69a8fe2ec3cfe
+RMD160 (edbrowse-3.7.4.tar.gz) = eb62948767144f67e1bb790e4e6e2c128300a112
+SHA512 (edbrowse-3.7.4.tar.gz) = 79b2b450b6f54f3d74b7c722f223b3340b3ddfa1cbff2d69adcd1cd4ffb76b78a812a35a053cf224a74543020ef8423cd68eafa9a277451245d383065fb1595d
+Size (edbrowse-3.7.4.tar.gz) = 765794 bytes
+SHA1 (patch-CMakeLists.txt) = 0c69e43f680cc2ddec42802d7ac1b7a3ef669e4a
diff --git a/edbrowse/patches/patch-CMakeLists.txt b/edbrowse/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..9da0b2f7bd
--- /dev/null
+++ b/edbrowse/patches/patch-CMakeLists.txt
@@ -0,0 +1,46 @@
+$NetBSD$
+
+Simplify a bit the installation of man pages and documentation and make it
+consistent to every Unix-like systems.
+
+TODO: Investigate if it's possible to simplify that even further!
+TODO: (in order to make an upstreamable patch)
+
+--- CMakeLists.txt.orig	2018-06-28 19:51:14.493572163 +0000
++++ CMakeLists.txt
+@@ -236,30 +236,14 @@ endif ()
+ ### 20180415 - Add man page gen, and install - also doc/usersguide.html
+ if (UNIX)
+     FILE (GLOB UnixManFile "doc/man-edbrowse-debian.1")
+-    set (UnixManDir "/usr/share/man/man1")
+-    set (UnixDocDir "/usr/share/doc/edbrowse")
+-    if (${CMAKE_SYSTEM_NAME} STREQUAL  "FreeBSD")
+-	FILE (GLOB UnixManFile "doc/man-edbrowse-freebsd.1")
+-        set (UnixManDir "/usr/local/man/man1")
+-        set (UnixDocDir "/usr/local/share/doc/edbrowse")
+-    endif()
++    set (UnixManDir "@PREFIX@/@PKGMANDIR@/man1")
++    set (UnixDocDir "@PREFIX@/share/doc/edbrowse")
+     # copy to build dir
+     configure_file( ${UnixManFile} ${CMAKE_BINARY_DIR}/edbrowse.1 )
+-    # find 'gzip' - warn if not...
+-    find_program(GZIP_EXE gzip PATHS /bin )
+-    if (GZIP_EXE)
+-        # gzip it in place
+-        execute_process(COMMAND ${GZIP_EXE} -f "edbrowse.1"
+-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+-            INPUT_FILE edbrowse.1
+-            OUTPUT_FILE edbrowse.1.gz )
+-        # install it
+-	install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1.gz DESTINATION ${UnixManDir})
+-    else ()
+-        message(WARNING "Unable to locate 'gzip'! No man page...")
+-    endif ()
++    # install man page
++    install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1 DESTINATION ${UnixManDir})
+     # install user guide
+-    install(FILES doc/usersguide.html doc/usersguide_fr.html doc/sample.ebrc doc/sample_fr.ebrc doc/sample_it.ebrc DESTINATION ${UnixDocDir})
++    install(FILES doc/usersguide.html doc/sample.ebrc DESTINATION ${UnixDocDir})
+ endif ()
+ 
+ ###########################################################
diff --git a/edbrowse/patches/patch-src_http.c b/edbrowse/patches/patch-src_http.c
deleted file mode 100644
index a1abea53ca..0000000000
--- a/edbrowse/patches/patch-src_http.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Also include <signal.h>, needed for signal(3).
-
-From upstream commit `885fbc5f18ae61f9af9faa3e9d25c67a65148f6a'.
-
---- src/http.c.orig	2018-03-30 01:25:41.000000000 +0000
-+++ src/http.c
-@@ -9,6 +9,7 @@
- #include <fcntl.h>
- #else
- #include <sys/wait.h>
-+#include <signal.h>
- #endif
- #include <time.h>
-
Prev by Date: canu: Add resource controls for SLURM
Next by Date: libreoffice-git: blindly update orcus0.12 to orcus
Previous by Thread: canu: Add resource controls for SLURM
Next by Thread: libreoffice-git: blindly update orcus0.12 to orcus
Indexes:
Home | Main Index | Thread Index | Old Index