Hi,
On Fri, Dec 22, 2017 at 12:22:58AM +0100, Jeremie Courreges-Anglas wrote:
> Fix for klavaro, which is affected by the same problems as audio/tagtool
> and editors/gummi. The diff below patches both Makefile.am (could be
> upstreamed?) and Makefile.in (to avoid bringing in automake).
>
> ok?
Fine for me if pea@ doesn't object. But please add a comment to the
Makefile.am patch that it's only there to be sent to upstream.
Ciao,
Kili
> Index: Makefile
> ===================================================================
> RCS file: /d/cvs/ports/x11/klavaro/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 28 Aug 2016 17:22:29 -0000 1.17
> +++ Makefile 21 Dec 2017 21:47:57 -0000
> @@ -3,7 +3,7 @@
> COMMENT = touch typing tutor program
>
> DISTNAME = klavaro-1.5.0
> -REVISION = 6
> +REVISION = 7
>
> CATEGORIES = x11
>
> Index: patches/patch-src_Makefile_am
> ===================================================================
> RCS file: patches/patch-src_Makefile_am
> diff -N patches/patch-src_Makefile_am
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_Makefile_am 21 Dec 2017 22:19:11 -0000
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +Fix passing --export-dynamic to the linker.
> +
> +Index: src/Makefile.am
> +--- src/Makefile.am.orig
> ++++ src/Makefile.am
> +@@ -24,5 +24,6 @@ AM_CPPFLAGS = @PACKAGE_CFLAGS@ \
> + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
> + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
> +
> +-AM_CFLAGS = -export-dynamic -Wall
> ++AM_CFLAGS = -Wall
> ++AM_LDAGS = -rdynamic
> +
> Index: patches/patch-src_Makefile_in
> ===================================================================
> RCS file: patches/patch-src_Makefile_in
> diff -N patches/patch-src_Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_Makefile_in 21 Dec 2017 22:19:11 -0000
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +Fix passing --export-dynamic to the linker.
> +
> +Index: src/Makefile.in
> +--- src/Makefile.in.orig
> ++++ src/Makefile.in
> +@@ -194,7 +194,8 @@ AM_CPPFLAGS = @PACKAGE_CFLAGS@ \
> + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
> + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
> +
> +-AM_CFLAGS = -export-dynamic -Wall
> ++AM_CFLAGS = -Wall
> ++AM_LDFLAGS = -rdynamic
> + all: all-am
> +
> + .SUFFIXES:
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
