Attachment 243909 Details for Bug 272985 – verbiste.patch

verbiste.patch

verbiste.patch (text/plain), 5.84 KB, created by Christian Weisgerber on 2023-08-06 19:58:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Weisgerber

Created: 2023-08-06 19:58:38 UTC

Size: 5.84 KB

patch

obsolete

>commit 26eeef77cb210d1a37b170b9e5dfdbe9c02afb6e
>Author: Christian Weisgerber <naddy@FreeBSD.org>
>Date:   Sun Aug 6 21:50:41 2023 +0200
>
>    french/verbiste: update to 0.1.48
>    
>    Maintenance update, no significant changes.
>    
>    Clean up the port after the forced removal of the GNOME option in
>    commit c399c4d12f6462f1d535e9a3143fe0e679a63eb8.
>
>diff --git a/french/verbiste/Makefile b/french/verbiste/Makefile
>index ebdcc2861f87..8574957d1c3a 100644
>--- a/french/verbiste/Makefile
>+++ b/french/verbiste/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	verbiste
>-PORTVERSION=	0.1.47
>-PORTREVISION=	2
>+PORTVERSION=	0.1.48
> CATEGORIES=	french education textproc
> MASTER_SITES=	http://sarrazip.com/dev/
> 
>@@ -10,7 +9,8 @@ WWW=		http://sarrazip.com/dev/verbiste.html
> 
> LICENSE=	GPLv2
> 
>-USES=		gnome pathfix pkgconfig iconv:wchar_t libtool shebangfix
>+USES=		gnome iconv:wchar_t pathfix pkgconfig libtool localbase \
>+		shebangfix
> USE_GNOME=	libxml2
> USE_LDCONFIG=	yes
> 
>@@ -18,34 +18,24 @@ GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
> SHEBANG_FILES=	${WRKSRC}/examples/*.pl
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-
> TEST_TARGET=	check
> 
> OPTIONS_DEFINE=	GTK2 DOCS EXAMPLES
> 
>-CONFIGURE_ARGS=	--without-gnome-app --without-gnome-applet
>-
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MGTK2}
>+USES+=		gettext
> USE_GNOME+=	cairo gdkpixbuf2 gtk20
> LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \
>-		libfreetype.so:print/freetype2
>+		libfreetype.so:print/freetype2 \
>+		libharfbuzz.so:print/harfbuzz
> PLIST_SUB+=	HASGTK=""
> .else
> CONFIGURE_ARGS+=--without-gtk-app
> PLIST_SUB+=	HASGTK="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MGTK2}
>-USES+=		gettext
>-PLIST_SUB+=	HASGUI=""
>-.else
>-PLIST_SUB+=	HASGUI="@comment "
>-.endif
>-
> post-install:
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> .for f in README *.java *.c
>diff --git a/french/verbiste/distinfo b/french/verbiste/distinfo
>index 37ed53d19008..8fef67899c98 100644
>--- a/french/verbiste/distinfo
>+++ b/french/verbiste/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1570142696
>-SHA256 (verbiste-0.1.47.tar.gz) = 75761c24a013a01ec89108f75f319e83000f8147906518ad1458f879878d7f0a
>-SIZE (verbiste-0.1.47.tar.gz) = 781085
>+TIMESTAMP = 1691349479
>+SHA256 (verbiste-0.1.48.tar.gz) = aa9d0e1691f80c89d68f3ada0c8ebe09e2a1f392646f05581e526bb88ac69c13
>+SIZE (verbiste-0.1.48.tar.gz) = 807115
>diff --git a/french/verbiste/files/patch-Makefile.in b/french/verbiste/files/patch-Makefile.in
>index b707470996e1..0dbe9f934806 100644
>--- a/french/verbiste/files/patch-Makefile.in
>+++ b/french/verbiste/files/patch-Makefile.in
>@@ -1,23 +1,14 @@
> Always skip included intl, otherwise the build fails if gettext isn't
> installed even if we never link against it.
> 
>---- Makefile.in.orig	2010-12-25 17:22:46.000000000 +0100
>-+++ Makefile.in	2010-12-25 17:23:03.000000000 +0100
>-@@ -319,7 +319,7 @@ builddir = @builddir@
>- datadir = @datadir@
>- datarootdir = @datarootdir@
>- # COPYING contains the license; main-window.cpp expects it there.
>--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
>-+docdir = $(datadir)/doc/$(PACKAGE)
>- dvidir = @dvidir@
>- exec_prefix = @exec_prefix@
>- host = @host@
>-@@ -351,7 +351,7 @@ target_alias = @target_alias@
>+--- Makefile.in.orig	2023-08-03 01:40:16 UTC
>++++ Makefile.in
>+@@ -469,7 +469,7 @@ target_alias = @target_alias@
>  top_build_prefix = @top_build_prefix@
>  top_builddir = @top_builddir@
>  top_srcdir = @top_srcdir@
> -SUBDIRS = intl src po macros $(am__append_1)
> +SUBDIRS = src po macros $(am__append_1)
>- libdatadir = $(datadir)/$(PACKAGE)-$(API)
>+ libdatadir = $(datarootdir)/$(PACKAGE)-$(API)
>  libdata_DATA = \
>  	data/conjugation-fr.xml \
>diff --git a/french/verbiste/pkg-plist b/french/verbiste/pkg-plist
>index 8761b7b3e04a..2231690f9601 100644
>--- a/french/verbiste/pkg-plist
>+++ b/french/verbiste/pkg-plist
>@@ -16,18 +16,6 @@ man/fr/man3/verbiste.3.gz
> man/man1/french-conjugator.1.gz
> man/man1/french-deconjugator.1.gz
> man/man3/verbiste.3.gz
>-%%HASGUI%%share/locale/da/LC_MESSAGES/verbiste.mo
>-%%HASGUI%%share/locale/de/LC_MESSAGES/verbiste.mo
>-%%HASGUI%%share/locale/el/LC_MESSAGES/verbiste.mo
>-%%HASGUI%%share/locale/fr/LC_MESSAGES/verbiste.mo
>-%%HASGUI%%share/locale/it/LC_MESSAGES/verbiste.mo
>-%%HASGUI%%share/icons/hicolor/16x16/apps/verbiste.png
>-%%HASGUI%%share/icons/hicolor/32x32/apps/verbiste.png
>-%%HASGUI%%share/icons/hicolor/48x48/apps/verbiste.png
>-%%HASGUI%%share/icons/hicolor/64x64/apps/verbiste.png
>-%%HASGUI%%share/icons/hicolor/128x128/apps/verbiste.png
>-%%HASGUI%%share/icons/hicolor/256x256/apps/verbiste.png
>-%%HASGUI%%share/icons/hicolor/512x512/apps/verbiste.png
> %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> %%PORTDOCS%%%%DOCSDIR%%/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/HACKING
>@@ -42,10 +30,23 @@ man/man3/verbiste.3.gz
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/generate-all-forms.pl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-french-deconjugator.pl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/trans-tenses.pl
>+%%HASGTK%%share/icons/hicolor/128x128/apps/verbiste.png
>+%%HASGTK%%share/icons/hicolor/16x16/apps/verbiste.png
>+%%HASGTK%%share/icons/hicolor/256x256/apps/verbiste.png
>+%%HASGTK%%share/icons/hicolor/32x32/apps/verbiste.png
>+%%HASGTK%%share/icons/hicolor/48x48/apps/verbiste.png
>+%%HASGTK%%share/icons/hicolor/512x512/apps/verbiste.png
>+%%HASGTK%%share/icons/hicolor/64x64/apps/verbiste.png
>+%%HASGTK%%share/icons/hicolor/scalable/apps/verbiste.svg
>+%%HASGTK%%share/locale/da/LC_MESSAGES/verbiste.mo
>+%%HASGTK%%share/locale/de/LC_MESSAGES/verbiste.mo
>+%%HASGTK%%share/locale/el/LC_MESSAGES/verbiste.mo
>+%%HASGTK%%share/locale/fr/LC_MESSAGES/verbiste.mo
>+%%HASGTK%%share/locale/it/LC_MESSAGES/verbiste.mo
>+%%HASGTK%%share/texmf/tex/latex/verbiste/verbiste.cfg
>+%%HASGTK%%share/texmf/tex/latex/verbiste/verbiste.cls
> %%DATADIR%%-0.1/COPYING
> %%DATADIR%%-0.1/conjugation-fr.xml
> %%DATADIR%%-0.1/conjugation-it.xml
> %%DATADIR%%-0.1/verbs-fr.xml
> %%DATADIR%%-0.1/verbs-it.xml
>-%%HASGTK%%share/texmf/tex/latex/verbiste/verbiste.cls
>-%%HASGTK%%share/texmf/tex/latex/verbiste/verbiste.cfg

Actions: View

Attachments on bug 272985: 243909