Attachment #173128 for bug #210927

Lines 3-8 Link Here

(-)x11/yelp/Makefile (-1 / +8 lines)
3		3
4	PORTNAME= yelp	4	PORTNAME= yelp
5	PORTVERSION= 3.18.1	5	PORTVERSION= 3.18.1
		6	PORTREVISION= 1
6	CATEGORIES= x11 gnome	7	CATEGORIES= x11 gnome
7	MASTER_SITES= GNOME	8	MASTER_SITES= GNOME
8	DIST_SUBDIR= gnome3	9	DIST_SUBDIR= gnome3
Lines 20-26 Link Here
20		21
21	PORTSCOUT= limitw:1,even	22	PORTSCOUT= limitw:1,even
22		23
23	USES= desktop-file-utils gettext gmake gnome libtool pathfix \	24	USES= autoreconf desktop-file-utils gettext gmake gnome libtool pathfix \
24	pkgconfig tar:xz	25	pkgconfig tar:xz
25	USE_XORG= x11 ice	26	USE_XORG= x11 ice
26	USE_GNOME= gtk30 intlhack libxml2 libxslt	27	USE_GNOME= gtk30 intlhack libxml2 libxslt
Lines 39-42 Link Here
39	YELP_LZMA_LIBS="-L/usr/lib -llzma"	40	YELP_LZMA_LIBS="-L/usr/lib -llzma"
40	.endif	41	.endif
41		42
		43	post-patch:
		44	@${CP} ${FILESDIR}/yelp-groff ${WRKSRC}/libyelp
		45
		46	post-install:
		47	${INSTALL_SCRIPT} ${FILESDIR}/yelp-groff ${STAGEDIR}${PREFIX}/libexec
		48
42	.include <bsd.port.mk>	49	.include <bsd.port.mk>




--- 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 = \

Line 0 Link Here

(-)x11/yelp/files/patch-libyelp_yelp-man-parser.c (+11 lines)
	1	--- libyelp/yelp-man-parser.c.orig 2016-07-10 15:09:15 UTC
	2	+++ libyelp/yelp-man-parser.c
	3	@@ -369,7 +369,7 @@ get_troff (gchar path, GError *error)
	4	{
	5	gint ystdout;
	6	GError *err = NULL;
	7	- const gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", path, NULL };
	8	+ const gchar *argv[] = { LIBEXECDIR "/yelp-groff", path, NULL };
	9	gchar **my_argv;
	10
	11	/* g_strdupv() should accept a "const gchar *". /




#!/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

Lines 26-31 Link Here

(-)x11/yelp/pkg-plist (+1 lines)
26	lib/yelp/libyelpcommon.so	26	lib/yelp/libyelpcommon.so
27	lib/yelp/web-extensions/libyelpwebextension.a	27	lib/yelp/web-extensions/libyelpwebextension.a
28	lib/yelp/web-extensions/libyelpwebextension.so	28	lib/yelp/web-extensions/libyelpwebextension.so
		29	libexec/yelp-groff
29	share/applications/yelp.desktop	30	share/applications/yelp.desktop
30	share/gtk-doc/html/libyelp/YelpDocument.html	31	share/gtk-doc/html/libyelp/YelpDocument.html
31	share/gtk-doc/html/libyelp/YelpSettings.html	32	share/gtk-doc/html/libyelp/YelpSettings.html

Return to bug 210927

Line 0 Link Here

(-)x11/yelp/files/patch-libyelp_Makefile.am (+18 lines)
	1	--- libyelp/Makefile.am.orig 2016-07-10 15:09:03 UTC
	2	+++ libyelp/Makefile.am
	3	@@ -65,6 +65,7 @@ yelp-common-types.c: $(libyelpcommon_hea
	4	$(libyelpcommon_headers)) > $@
	5
	6	lib_LTLIBRARIES = libyelp.la
	7	+libexec_SCRIPTS = yelp-groff
	8
	9	libyelp_la_SOURCES = \
	10	yelp-bookmarks.c \
	11	@@ -115,6 +116,7 @@ libyelp_la_CFLAGS =
	12	$(YELP_CFLAGS) \
	13	-Wno-deprecated-declarations \
	14	-DDATADIR=\""$(datadir)"\" \
	15	+ -DLIBEXECDIR=\"$(libexecdir)\" \
	16	-DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\"
	17
	18	libyelp_la_CPPFLAGS = \

Line 0 Link Here

(-)x11/yelp/files/yelp-groff (+49 lines)
	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2011 Alexandre Rostovtsev <tetromino@gmail.com>
	4	#
	5	# This program is free software; you can redistribute it and/or
	6	# modify it under the terms of the GNU General Public License as
	7	# published by the Free Software Foundation; either version 2 of the
	8	# License, or (at your option) any later version.
	9	#
	10	# This program is distributed in the hope that it will be useful,
	11	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	13	# General Public License for more details.
	14	#
	15	# You should have received a copy of the GNU General Public
	16	# License along with this program; if not, write to the
	17	# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	18	# Boston, MA 02110-1301, USA.
	19	#
	20	###
	21	#
	22	# Process the requested compressed source nroff file and output groff
	23	# intermediate format.
	24	#
	25
	26	filename=$1
	27
	28	if [ -z ${filename} ] ; then
	29	echo "Usage: yelp-groff [FILE]" >&2
	30	echo "Process a man FILE and output groff intermediate format."
	31	exit 1
	32	fi
	33
	34	# If "man -Z -Tutf8 -EUTF-8" works (i.e. if man is man-db), use that.
	35	man -Z -Tutf8 -EUTF-8 ${filename} 2>/dev/null && exit 0
	36
	37	# Otherwise, manually uncompress the file ...
	38	cat="cat"
	39	case ${filename} in
	40	*.bz2) cat="bzip2 -c -d" ;;
	41	*.gz) cat="gunzip -c" ;;
	42	*.lzma) cat="unlzma -c -d" ;;
	43	*.xz) cat="unxz -c" ;;
	44	*.Z) cat="zcat" ;;
	45	esac
	46
	47	# ... and run groff to get the intermediate format; preprocess with tbl
	48	# unless MANROFFSEQ is defined.
	49	${cat} ${filename} \| groff -${MANROFFSEQ:-t} -man -Z -Tutf8