Date: Fri, 2 Jun 2017 16:42:15 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r442407 - in head/math/gretl: . files Message-ID: <201706021642.v52GgFTc024885@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Fri Jun 2 16:42:15 2017 New Revision: 442407 URL: https://svnweb.freebsd.org/changeset/ports/442407 Log: - Add missing NLS option to OPTIONS_DEFINE, LICENSE_FILE - Register missing dependencies found by stage-qa - Convert to USES=localbase - Use options helpers - Strip gretl-gtk2 plugins - Regenerate patches with make makepatch, use correct patch naming Added: head/math/gretl/files/patch-gui2_Makefile.in - copied, changed from r442406, head/math/gretl/files/patch-gui2__Makefile.in head/math/gretl/files/patch-lib_Makefile.in - copied, changed from r442406, head/math/gretl/files/patch-lib__Makefile.in head/math/gretl/files/patch-plugin_Makefile.in - copied, changed from r442406, head/math/gretl/files/patch-plugin__Makefile.in head/math/gretl/files/patch-plugin_workbook.c - copied, changed from r442406, head/math/gretl/files/patch-plugin__workbook.c head/math/gretl/files/patch-share_Makefile.in - copied, changed from r442406, head/math/gretl/files/patch-share__Makefile.in head/math/gretl/files/patch-share_bcih_Makefile.in - copied, changed from r442406, head/math/gretl/files/patch-share__bcih__Makefile.in Deleted: head/math/gretl/files/patch-gui2__Makefile.in head/math/gretl/files/patch-lib__Makefile.in head/math/gretl/files/patch-plugin__Makefile.in head/math/gretl/files/patch-plugin__workbook.c head/math/gretl/files/patch-share__Makefile.in head/math/gretl/files/patch-share__bcih__Makefile.in Modified: head/math/gretl/Makefile head/math/gretl/files/patch-Makefile.in Modified: head/math/gretl/Makefile ============================================================================== --- head/math/gretl/Makefile Fri Jun 2 16:15:13 2017 (r442406) +++ head/math/gretl/Makefile Fri Jun 2 16:42:15 2017 (r442407) @@ -3,7 +3,7 @@ PORTNAME= gretl PORTVERSION= 1.9.13 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= math finance MASTER_SITES= SF @@ -11,97 +11,64 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GNU Regression, Econometrics, and Time-series Library LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl \ - libfftw3.so:math/fftw3 + libfftw3.so:math/fftw3 \ + libgmp.so:math/gmp \ + libmpfr.so:math/mpfr GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= fortran gmake libtool pathfix pkgconfig tar:bzip2 -WANT_GNOME= yes +USES= fortran gmake localbase libtool ncurses pathfix pkgconfig \ + readline tar:bzip2 ALL_TARGET= # empty CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake \ --disable-xdg-utils -CONFIGURE_ENV= ac_cv_lib_dl_dlopen="" -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= LAPACK_LIBS="${LAPACK} ${BLAS}" +CONFIGURE_ENV= ac_cv_lib_dl_dlopen="" \ + LAPACK_LIBS="${LAPACK} ${BLAS}" -OPTIONS_DEFINE= ATLAS GUI ODBC OPENMP R UNZIP +OPTIONS_DEFINE= ATLAS GUI NLS ODBC OPENMP R UNZIP +OPTIONS_DEFAULT= GUI OPENMP UNZIP +OPTIONS_SUB= yes ATLAS_DESC= Use ATLAS for BLAS and LAPACK +ATLAS_LIB_DEPENDS= libatlas.so:math/atlas +ATLAS_LIB_DEPENDS_OFF= libblas.so:math/blas \ + liblapack.so:math/lapack +ATLAS_VARS= BLAS=-lf77blas LAPACK="-lalapack -lcblas" +ATLAS_VARS_OFF= BLAS=-lblas LAPACK=-llapack + GUI_DESC= Graphical user interface and plugins -R_DESC= libR support -UNZIP_DESC= UnZip compression support via libgsf +GUI_CONFIGURE_ON= --enable-gtk2=yes --enable-gui=yes +GUI_CONFIGURE_OFF= --enable-gui=no --enable-xdg=no +GUI_VARS= INSTALLS_ICONS=yes +GUI_USE= GNOME=cairo,gtksourceview2 +GUI_USE_OFF= GNOME=glib20,libxml2 +GUI_USES= desktop-file-utils shared-mime-info +GUI_BUILD_DEPENDS= gnuplot:math/gnuplot +GUI_LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig +GUI_RUN_DEPENDS= gnuplot:math/gnuplot -OPTIONS_DEFAULT= GUI OPENMP UNZIP +NLS_CONFIGURE_ON= --enable-nls=yes +NLS_CONFIGURE_OFF= --enable-nls=no +NLS_USES= gettext -.include <bsd.port.options.mk> +ODBC_CONFIGURE_WITH= odbc +ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -.if ${PORT_OPTIONS:MATLAS} -LIB_DEPENDS+= libatlas.so:math/atlas -BLAS= -lf77blas -LAPACK= -lalapack -lcblas -.else -LIB_DEPENDS+= libblas.so:math/blas \ - liblapack.so:math/lapack -BLAS= -lblas -LAPACK= -llapack -.endif +OPENMP_CONFIGURE_ON= --enable-openmp -.if ${PORT_OPTIONS:MGUI} -CONFIGURE_ARGS+= --enable-gtk2=yes --enable-gui=yes -INSTALLS_ICONS= yes -USE_GNOME= gtksourceview2 -USES+= desktop-file-utils shared-mime-info -BUILD_DEPENDS+= gnuplot:math/gnuplot -RUN_DEPENDS+= gnuplot:math/gnuplot -PLIST_SUB+= GUI="" -.else -USE_GNOME= glib20 libxml2 -CONFIGURE_ARGS+= --enable-gui=no --enable-xdg=no -PLIST_SUB+= GUI="@comment " -.endif +R_DESC= libR support +R_CONFIGURE_WITH= libR +R_LIB_DEPENDS= libR.so:math/R -.if ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+= --enable-nls=yes -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --enable-nls=no -PLIST_SUB+= NLS="@comment " -.endif +UNZIP_DESC= UnZip compression support via libgsf +UNZIP_CONFIGURE_WITH= gsf +UNZIP_USE= GNOME=libgsf -.if ${PORT_OPTIONS:MODBC} -CONFIGURE_ARGS+= --with-odbc -LIB_DEPENDS+= libodbc.so:databases/unixODBC -PLIST_SUB+= ODBC="" -.else -CONFIGURE_ARGS+= --without-odbc -PLIST_SUB+= ODBC="@comment " -.endif - -.if ${PORT_OPTIONS:MOPENMP} -CONFIGURE_ARGS+= --enable-openmp -.endif - -.if ${PORT_OPTIONS:MR} -CONFIGURE_ARGS+= --with-libR -LIB_DEPENDS+= libR.so:math/R -.else -CONFIGURE_ARGS+= --without-libR -.endif - -.if ${PORT_OPTIONS:MUNZIP} -CONFIGURE_ARGS+= --with-gsf -USE_GNOME+= libgsf -PLIST_SUB+= NO_UNZIP="@comment " -.else -CONFIGURE_ARGS+= --without-gsf -PLIST_SUB+= NO_UNZIP="" -.endif - .if !empty(MACHINE_CPU:Msse2) CONFIGURE_ARGS+= --enable-sse2=yes .else @@ -119,5 +86,8 @@ post-patch: regression-test test check: build @cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_ARGS} check + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gretl-gtk2/*.so .include <bsd.port.mk> Modified: head/math/gretl/files/patch-Makefile.in ============================================================================== --- head/math/gretl/files/patch-Makefile.in Fri Jun 2 16:15:13 2017 (r442406) +++ head/math/gretl/files/patch-Makefile.in Fri Jun 2 16:42:15 2017 (r442407) @@ -1,7 +1,7 @@ ---- Makefile.in.orig Thu Sep 12 00:35:22 2002 -+++ Makefile.in Mon Oct 21 10:02:37 2002 -@@ -22,8 +22,9 @@ - GUIDIR = gui +--- Makefile.in.orig 2017-06-01 20:13:36 UTC ++++ Makefile.in +@@ -40,8 +40,9 @@ ifeq ($(use_xdg),yes) + XDGDIR = xdg endif -INSTALL_PROGRAM = ${INSTALL} -m 755 Copied and modified: head/math/gretl/files/patch-gui2_Makefile.in (from r442406, head/math/gretl/files/patch-gui2__Makefile.in) ============================================================================== --- head/math/gretl/files/patch-gui2__Makefile.in Fri Jun 2 16:15:13 2017 (r442406, copy source) +++ head/math/gretl/files/patch-gui2_Makefile.in Fri Jun 2 16:42:15 2017 (r442407) @@ -1,6 +1,6 @@ ---- gui2/Makefile.in.orig 2013-03-30 13:23:00.000000000 -0400 -+++ gui2/Makefile.in 2013-11-20 00:31:53.000000000 -0500 -@@ -122,7 +122,7 @@ +--- gui2/Makefile.in.orig 2017-06-01 20:13:36 UTC ++++ gui2/Makefile.in +@@ -122,7 +122,7 @@ ifeq ($(mac_native),yes) PROG = gretl else PROG = gretl_x11$(EXEEXT) @@ -9,7 +9,7 @@ endif vpath %.c $(topsrc)/gui2 -@@ -215,7 +215,7 @@ +@@ -215,7 +215,7 @@ $(GRETL_LANG): $(MKLANG) .PHONY: @@ -18,7 +18,7 @@ install-strip: $(PROG) install-data $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(bindir)/$(PROG) -@@ -229,7 +229,7 @@ +@@ -229,7 +229,7 @@ install-ui: installdirs $(INSTALL_DATA) $(topsrc)/gui2/gretlmodel.xml $(DESTDIR)$(uidir) install-script: installdirs Copied and modified: head/math/gretl/files/patch-lib_Makefile.in (from r442406, head/math/gretl/files/patch-lib__Makefile.in) ============================================================================== --- head/math/gretl/files/patch-lib__Makefile.in Fri Jun 2 16:15:13 2017 (r442406, copy source) +++ head/math/gretl/files/patch-lib_Makefile.in Fri Jun 2 16:42:15 2017 (r442407) @@ -1,6 +1,6 @@ ---- lib/Makefile.in.orig 2013-08-16 13:12:54.000000000 -0400 -+++ lib/Makefile.in 2013-11-18 21:43:54.000000000 -0500 -@@ -70,7 +70,7 @@ +--- lib/Makefile.in.orig 2017-06-01 20:13:36 UTC ++++ lib/Makefile.in +@@ -70,7 +70,7 @@ INSTALLDIRS = $(DESTDIR)$(libdir) $(DESTDIR)$(included LIBGRETL = libgretl-1.0.la Copied and modified: head/math/gretl/files/patch-plugin_Makefile.in (from r442406, head/math/gretl/files/patch-plugin__Makefile.in) ============================================================================== --- head/math/gretl/files/patch-plugin__Makefile.in Fri Jun 2 16:15:13 2017 (r442406, copy source) +++ head/math/gretl/files/patch-plugin_Makefile.in Fri Jun 2 16:42:15 2017 (r442407) @@ -1,6 +1,6 @@ ---- plugin/Makefile.in.orig 2013-02-19 10:08:31.000000000 -0500 -+++ plugin/Makefile.in 2013-04-20 18:20:25.000000000 -0400 -@@ -350,13 +350,13 @@ +--- plugin/Makefile.in.orig 2017-06-01 20:13:36 UTC ++++ plugin/Makefile.in +@@ -354,13 +354,13 @@ $(GRETLLIB): .PHONY: install: $(GRETLLIB) $(PLUGINS) $(URCDATA) $(DWDATA) installdirs Copied and modified: head/math/gretl/files/patch-plugin_workbook.c (from r442406, head/math/gretl/files/patch-plugin__workbook.c) ============================================================================== --- head/math/gretl/files/patch-plugin__workbook.c Fri Jun 2 16:15:13 2017 (r442406, copy source) +++ head/math/gretl/files/patch-plugin_workbook.c Fri Jun 2 16:42:15 2017 (r442407) @@ -1,10 +1,10 @@ ---- plugin/workbook.c.orig Fri May 31 22:22:42 2002 -+++ plugin/workbook.c Sat Jul 27 08:45:00 2002 +--- plugin/workbook.c.orig 2010-11-25 16:42:23 UTC ++++ plugin/workbook.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <stdlib.h> #include <glib.h> +#include <wchar.h> - #ifdef G_OS_WIN32 - # include "../winconfig.h" + #include "libgretl.h" + Copied and modified: head/math/gretl/files/patch-share_Makefile.in (from r442406, head/math/gretl/files/patch-share__Makefile.in) ============================================================================== --- head/math/gretl/files/patch-share__Makefile.in Fri Jun 2 16:15:13 2017 (r442406, copy source) +++ head/math/gretl/files/patch-share_Makefile.in Fri Jun 2 16:42:15 2017 (r442407) @@ -1,6 +1,6 @@ ---- share/Makefile.in.orig 2011-02-10 16:40:30.000000000 -0500 -+++ share/Makefile.in 2011-03-02 07:43:03.000000000 -0500 -@@ -13,7 +13,7 @@ +--- share/Makefile.in.orig 2017-06-01 20:13:36 UTC ++++ share/Makefile.in +@@ -12,7 +12,7 @@ tooldir = $(topsrc)/tools sharesrc = $(topsrc)/share pdfdir = ../doc/tex @@ -9,8 +9,8 @@ AUTO_HELPFILES = \ gretlgui.hlp \ -@@ -80,22 +80,22 @@ - $(INSTALL_DATA) $(sharesrc)/functions/criteria.gfn $(DESTDIR)$(gretldir)/functions +@@ -86,22 +86,22 @@ install_functions: + $(INSTALL_DATA) $(sharesrc)/functions/packages.xml $(DESTDIR)$(gretldir)/functions install_man: gretl.1 - $(tooldir)/mkinstalldirs $(DESTDIR)$(prefix)/share/man/man1 Copied and modified: head/math/gretl/files/patch-share_bcih_Makefile.in (from r442406, head/math/gretl/files/patch-share__bcih__Makefile.in) ============================================================================== --- head/math/gretl/files/patch-share__bcih__Makefile.in Fri Jun 2 16:15:13 2017 (r442406, copy source) +++ head/math/gretl/files/patch-share_bcih_Makefile.in Fri Jun 2 16:42:15 2017 (r442407) @@ -1,6 +1,6 @@ ---- share/bcih/Makefile.in.orig 2011-08-21 15:13:15.000000000 -0400 -+++ share/bcih/Makefile.in 2011-10-18 21:24:45.000000000 -0400 -@@ -2,7 +2,7 @@ +--- share/bcih/Makefile.in.orig 2017-06-01 20:13:36 UTC ++++ share/bcih/Makefile.in +@@ -2,7 +2,7 @@ topsrc = @top_srcdir@ CC = @CC@ HOSTCC = @HOSTCC@
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706021642.v52GgFTc024885>