Attachment 173128 Details for Bug 210927 – patch-yelp-man-compatibility

[patch] patch-yelp-man-compatibility

patch-yelp-man-compatibility.diff (text/plain), 5.64 KB, created by Carlos J. Puga Medina on 2016-07-30 21:45:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2016-07-30 21:45:56 UTC

Size: 5.64 KB

patch

obsolete

>Index: x11/yelp/Makefile
>===================================================================
>--- x11/yelp/Makefile	(revision 419330)
>+++ x11/yelp/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	yelp
> PORTVERSION=	3.18.1
>+PORTREVISION=	1
> CATEGORIES=	x11 gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>@@ -20,7 +21,7 @@
> 
> PORTSCOUT=	limitw:1,even
> 
>-USES=		desktop-file-utils gettext gmake gnome libtool pathfix \
>+USES=		autoreconf desktop-file-utils gettext gmake gnome libtool pathfix \
> 		pkgconfig tar:xz
> USE_XORG=	x11 ice
> USE_GNOME=	gtk30 intlhack libxml2 libxslt
>@@ -39,4 +40,10 @@
> 		YELP_LZMA_LIBS="-L/usr/lib -llzma"
> .endif
> 
>+post-patch:
>+	@${CP} ${FILESDIR}/yelp-groff ${WRKSRC}/libyelp
>+
>+post-install:
>+	${INSTALL_SCRIPT} ${FILESDIR}/yelp-groff ${STAGEDIR}${PREFIX}/libexec
>+
> .include <bsd.port.mk>
>Index: x11/yelp/files/patch-libyelp_Makefile.am
>===================================================================
>--- x11/yelp/files/patch-libyelp_Makefile.am	(nonexistent)
>+++ x11/yelp/files/patch-libyelp_Makefile.am	(working copy)
>@@ -0,0 +1,18 @@
>+--- libyelp/Makefile.am.orig	2016-07-10 15:09:03 UTC
>++++ libyelp/Makefile.am
>+@@ -65,6 +65,7 @@ yelp-common-types.c: $(libyelpcommon_hea
>+ 	$(libyelpcommon_headers)) > $@
>+ 
>+ lib_LTLIBRARIES = libyelp.la
>++libexec_SCRIPTS = yelp-groff
>+ 
>+ libyelp_la_SOURCES =                \
>+ 	yelp-bookmarks.c            \
>+@@ -115,6 +116,7 @@ libyelp_la_CFLAGS =                     
>+ 	$(YELP_CFLAGS)                          \
>+ 	-Wno-deprecated-declarations		\
>+ 	-DDATADIR=\""$(datadir)"\"              \
>++	-DLIBEXECDIR=\"$(libexecdir)\"		\
>+ 	-DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\"
>+ 
>+ libyelp_la_CPPFLAGS = \
>
>Property changes on: x11/yelp/files/patch-libyelp_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11/yelp/files/patch-libyelp_yelp-man-parser.c
>===================================================================
>--- x11/yelp/files/patch-libyelp_yelp-man-parser.c	(nonexistent)
>+++ x11/yelp/files/patch-libyelp_yelp-man-parser.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- libyelp/yelp-man-parser.c.orig	2016-07-10 15:09:15 UTC
>++++ libyelp/yelp-man-parser.c
>+@@ -369,7 +369,7 @@ get_troff (gchar *path, GError **error)
>+ {
>+     gint ystdout;
>+     GError *err = NULL;
>+-    const gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", path, NULL };
>++    const gchar *argv[] = { LIBEXECDIR "/yelp-groff", path, NULL };
>+     gchar **my_argv;
>+ 
>+     /* g_strdupv() should accept a "const gchar **". */
>
>Property changes on: x11/yelp/files/patch-libyelp_yelp-man-parser.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11/yelp/files/yelp-groff
>===================================================================
>--- x11/yelp/files/yelp-groff	(nonexistent)
>+++ x11/yelp/files/yelp-groff	(working copy)
>@@ -0,0 +1,49 @@
>+#!/bin/sh
>+#
>+# Copyright (c) 2011 Alexandre Rostovtsev <tetromino@gmail.com>
>+#
>+# This program is free software; you can redistribute it and/or
>+# modify it under the terms of the GNU General Public License as
>+# published by the Free Software Foundation; either version 2 of the
>+# License, or (at your option) any later version.
>+#
>+# This program is distributed in the hope that it will be useful,
>+# but WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+# General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public
>+# License along with this program; if not, write to the
>+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
>+# Boston, MA 02110-1301, USA.
>+#
>+###
>+#
>+# Process the requested compressed source nroff file and output groff
>+# intermediate format.
>+#
>+
>+filename=$1
>+
>+if [ -z ${filename} ] ; then
>+    echo "Usage: yelp-groff [FILE]" >&2
>+    echo "Process a man FILE and output groff intermediate format."
>+    exit 1
>+fi
>+
>+# If "man -Z -Tutf8 -EUTF-8" works (i.e. if man is man-db), use that.
>+man -Z -Tutf8 -EUTF-8 ${filename} 2>/dev/null && exit 0
>+
>+# Otherwise, manually uncompress the file ...
>+cat="cat"
>+case ${filename} in
>+    *.bz2)      cat="bzip2 -c -d" ;;
>+    *.gz)       cat="gunzip -c" ;;
>+    *.lzma)     cat="unlzma -c -d" ;;
>+    *.xz)       cat="unxz -c" ;;
>+    *.Z)        cat="zcat" ;;
>+esac
>+
>+# ... and run groff to get the intermediate format; preprocess with tbl
>+# unless MANROFFSEQ is defined.
>+${cat} ${filename} | groff -${MANROFFSEQ:-t} -man -Z -Tutf8
>
>Property changes on: x11/yelp/files/yelp-groff
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11/yelp/pkg-plist
>===================================================================
>--- x11/yelp/pkg-plist	(revision 419330)
>+++ x11/yelp/pkg-plist	(working copy)
>@@ -26,6 +26,7 @@
> lib/yelp/libyelpcommon.so
> lib/yelp/web-extensions/libyelpwebextension.a
> lib/yelp/web-extensions/libyelpwebextension.so
>+libexec/yelp-groff
> share/applications/yelp.desktop
> share/gtk-doc/html/libyelp/YelpDocument.html
> share/gtk-doc/html/libyelp/YelpSettings.html

Actions: View | Diff

Attachments on bug 210927: 172326 | 172533 | 172535 | 173072 | 173128