Il 22/giu/2015 20:39, "Ingo Feinerer" <[email protected]> ha scritto:
>
> Update math/R 3.2.0 -> 3.2.1:
>
> - Use base readline (handling is still fine)
Right, no more need for this now that devel/readline has been fixed to not
conflict with readline from base.
> - patch-src_include_Rinterface_h is now included in upstream
> - Avoid LIBINTL->LTLIBINTL patches (works fine for me in various locales)
> - Simplify javareconf patch
> - Remove outdated comments
>
> OK?
ok dcoppa@
> Best regards,
> Ingo
Thanks,
David
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/R/Makefile,v
> retrieving revision 1.71
> diff -u -p -r1.71 Makefile
> --- Makefile 28 May 2015 08:09:46 -0000 1.71
> +++ Makefile 22 Jun 2015 18:02:09 -0000
> @@ -3,8 +3,7 @@
> SHARED_ONLY= Yes
>
> COMMENT= powerful math/statistics/graphics language
> -DISTNAME= R-3.2.0
> -REVISION= 1
> +DISTNAME= R-3.2.1
>
> SHARED_LIBS= R 3.1
> SHARED_LIBS+= Rlapack 31.2 # 31.2
> @@ -19,7 +18,7 @@ MAINTAINER= Ingo Feinerer <feinerer@logi
> PERMIT_PACKAGE_CDROM= Yes
>
> WANTLIB= ICE SM X11 Xext Xmu Xss Xt bz2 c crypto curl \
> - cairo ereadline fontconfig freetype glib-2.0 \
> + cairo readline fontconfig freetype glib-2.0 \
> gobject-2.0 icui18n icuuc idn jpeg lzma m \
> ncurses pango-1.0 pangocairo-1.0 \
> pangoft2-1.0 pcre png pthread ssl tiff z \
> @@ -57,7 +56,6 @@ LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} \
> devel/glib2 \
> devel/libidn \
> devel/pango \
> - devel/readline \
> graphics/cairo \
> graphics/jpeg \
> graphics/png \
> @@ -84,7 +82,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
> --with-tk-config=${MODTK_CONFIG}
>
> CONFIGURE_ENV= FFLAGS="${FFLAGS}" \
> - CPPFLAGS="-I${LOCALBASE}/include/ereadline
-I${LOCALBASE}/include" \
> + CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib/R/lib"
\
> LIBnn=lib \
> ac_cv_path_PDFLATEX="" \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/math/R/distinfo,v
> retrieving revision 1.24
> diff -u -p -r1.24 distinfo
> --- distinfo 29 Apr 2015 21:53:43 -0000 1.24
> +++ distinfo 22 Jun 2015 18:02:09 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (R-3.2.0.tar.gz) = 9a6VPxi6bz1VtGVWu79zRBNQ+f0iYlQCtyOiuB/2TzU=
> -SIZE (R-3.2.0.tar.gz) = 29124927
> +SHA256 (R-3.2.1.tar.gz) = 1Z28PwT0YEpc8PshC46nA+8kOLPuZf1atTbsUjT0yYI=
> +SIZE (R-3.2.1.tar.gz) = 29197870
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/math/R/patches/patch-Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-Makefile_in
> --- patches/patch-Makefile_in 2 May 2015 09:22:58 -0000 1.7
> +++ patches/patch-Makefile_in 22 Jun 2015 18:02:09 -0000
> @@ -1,7 +1,5 @@
> $OpenBSD: patch-Makefile_in,v 1.7 2015/05/02 09:22:58 zhuk Exp $
>
> -Do not build PDF versions of the R manuals
> -
> --- Makefile.in.orig Thu Mar 19 02:02:06 2015
> +++ Makefile.in Sat May 2 11:47:48 2015
> @@ -82,8 +82,6 @@ vignettes: stamp-recommended
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/math/R/patches/patch-configure,v
> retrieving revision 1.23
> diff -u -p -r1.23 patch-configure
> --- patches/patch-configure 2 May 2015 09:22:58 -0000 1.23
> +++ patches/patch-configure 22 Jun 2015 18:02:09 -0000
> @@ -1,65 +1,9 @@
> $OpenBSD: patch-configure,v 1.23 2015/05/02 09:22:58 zhuk Exp $
>
> -Use GNU readline instead of our base readline
> -
> Unbreak build on powerpc (relocation truncated to fit: R_PPC_GOT16...)
>
> -Fix "--export-dynamic" linker flag
> -
> -Fix linking with external libintl
> -
> --- configure.orig Thu Apr 9 01:16:36 2015
> +++ configure Sat May 2 11:47:48 2015
> -@@ -20921,12 +20921,12 @@ done
> - ## don't use the cached value as we need to rebuild LIBS
> - unset ac_cv_lib_readline_rl_callback_read_char
> - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
rl_callback_read_char in -lreadline" >&5
> --$as_echo_n "checking for rl_callback_read_char in -lreadline... " >&6; }
> -+$as_echo_n "checking for rl_callback_read_char in -lereadline... " >&6;
}
> - if ${ac_cv_lib_readline_rl_callback_read_char+:} false; then :
> - $as_echo_n "(cached) " >&6
> - else
> - ac_check_lib_save_LIBS=$LIBS
> --LIBS="-lreadline $LIBS"
> -+LIBS="-lereadline $LIBS"
> - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> - /* end confdefs.h. */
> -
> -@@ -20961,7 +20961,7 @@ if test
"x$ac_cv_lib_readline_rl_callback_read_char" =
> - #define HAVE_LIBREADLINE 1
> - _ACEOF
> -
> -- LIBS="-lreadline $LIBS"
> -+ LIBS="-lereadline $LIBS"
> -
> - fi
> -
> -@@ -21088,13 +21088,13 @@ fi
> -
> - fi
> -
> -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
rl_callback_read_char in -lreadline" >&5
> --$as_echo_n "checking for rl_callback_read_char in -lreadline... " >&6; }
> -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
rl_callback_read_char in -lereadline" >&5
> -+$as_echo_n "checking for rl_callback_read_char in -lereadline... " >&6;
}
> - if ${ac_cv_lib_readline_rl_callback_read_char+:} false; then :
> - $as_echo_n "(cached) " >&6
> - else
> - ac_check_lib_save_LIBS=$LIBS
> --LIBS="-lreadline $LIBS"
> -+LIBS="-lereadline $LIBS"
> - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> - /* end confdefs.h. */
> -
> -@@ -21129,7 +21129,7 @@ if test
"x$ac_cv_lib_readline_rl_callback_read_char" =
> - #define HAVE_LIBREADLINE 1
> - _ACEOF
> -
> -- LIBS="-lreadline $LIBS"
> -+ LIBS="-lereadline $LIBS"
> -
> - fi
> -
> @@ -26276,7 +26276,7 @@ if test "${GCC}" = yes; then
> ## has 32k and so can use -fpic.
> ## However, although the gcc docs do not mention it, it seems s390/s390x
> @@ -96,23 +40,3 @@ Fix linking with external libintl
> fcpicflags="-fPIC"
> ;;
> *)
> -@@ -42616,7 +42616,7 @@ else
> - gt_save_CPPFLAGS="$CPPFLAGS"
> - CPPFLAGS="$CPPFLAGS $INCINTL"
> - gt_save_LIBS="$LIBS"
> -- LIBS="$LIBS $LIBINTL"
> -+ LIBS="$LIBS $LTLIBINTL"
> - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> - /* end confdefs.h. */
> - #include <libintl.h>
> -@@ -42773,8 +42773,8 @@ $as_echo "$gt_source" >&6; }
> - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val"
= "yes"; }; then
> - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link
with libintl" >&5
> - $as_echo_n "checking how to link with libintl... " >&6; }
> -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
> --$as_echo "$LIBINTL" >&6; }
> -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LTLIBINTL" >&5
> -+$as_echo "$LTLIBINTL" >&6; }
> -
> - for element in $INCINTL; do
> - haveit=
> Index: patches/patch-src_include_Rinterface_h
> ===================================================================
> RCS file: patches/patch-src_include_Rinterface_h
> diff -N patches/patch-src_include_Rinterface_h
> --- patches/patch-src_include_Rinterface_h 2 May 2015 09:10:04
-0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-src_include_Rinterface_h,v 1.1 2015/05/02 09:10:04 zhuk
Exp $
> -Unbreak linking to R library.
> ---- src/include/Rinterface.h.orig Sat May 2 11:49:46 2015
> -+++ src/include/Rinterface.h Sat May 2 11:49:53 2015
> -@@ -90,7 +90,7 @@ void R_setStartTime(void);
> - void fpu_setup(Rboolean);
> -
> - /* in unix/system.c */
> --int R_running_as_main_program;
> -+extern int R_running_as_main_program;
> -
> - #ifdef CSTACK_DEFNS
> - /* duplicating Defn.h */
> Index: patches/patch-src_main_Makefile_in
> ===================================================================
> RCS file: patches/patch-src_main_Makefile_in
> diff -N patches/patch-src_main_Makefile_in
> --- patches/patch-src_main_Makefile_in 2 May 2015 09:22:58 -0000
1.11
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-src_main_Makefile_in,v 1.11 2015/05/02 09:22:58 zhuk Exp
$
> ---- src/main/Makefile.in.orig Thu Mar 19 02:03:54 2015
> -+++ src/main/Makefile.in Sat May 2 11:47:48 2015
> -@@ -103,7 +103,7 @@ EXTRA_STATIC_LIBS = \
> - $(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ)
$(R_LIBINTL) $(R_TZONE)
> - STATIC_LIBS = $(MAIN_LIBS) $(EXTRA_STATIC_LIBS)
> -
> --EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@
$(READLINE_LIBS) $(LIBS)
> -+EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LTLIBINTL@
$(READLINE_LIBS) $(LIBS)
> -
> - R_binary = R.bin
> - R_bin_OBJECTS = Rmain.o @WANT_R_SHLIB_FALSE@$(OBJECTS)
> Index: patches/patch-src_main_connections_c
> ===================================================================
> RCS file: /cvs/ports/math/R/patches/patch-src_main_connections_c,v
> retrieving revision 1.17
> diff -u -p -r1.17 patch-src_main_connections_c
> --- patches/patch-src_main_connections_c 2 May 2015 09:22:58
-0000 1.17
> +++ patches/patch-src_main_connections_c 22 Jun 2015 18:02:09 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-src_main_connections_c,v 1.17 2015/05/02 09:22:58 zhuk
Exp $
> ---- src/main/connections.c.orig Thu Mar 19 02:03:55 2015
> -+++ src/main/connections.c Sat May 2 11:47:48 2015
> -@@ -5249,7 +5249,8 @@ static Rboolean gzcon_open(Rconnection con)
> +--- src/main/connections.c.orig Fri May 22 00:15:20 2015
> ++++ src/main/connections.c Fri Jun 19 18:52:41 2015
> +@@ -5251,7 +5251,8 @@ static Rboolean gzcon_open(Rconnection con)
>
> if(con->canread) {
> /* read header */
> Index: patches/patch-src_scripts_javareconf_in
> ===================================================================
> RCS file: /cvs/ports/math/R/patch
