From da4dfbe02f7333725584850899fbbdb4ecc04714 Mon Sep 17 00:00:00 2001
From: Saagar Jha <saagar@saagarjha.com>
Date: Sun, 10 Feb 2019 22:21:24 -0800
Subject: [PATCH] tilp2: Update to 1.18

* Add patch to remove KDE cruft from upstream
* Add build dependency on intltool
* Use autoreconf
* Add new livecheck
---
 math/tilp2/Portfile                    | 16 +++--
 math/tilp2/files/patch-remove-kde.diff | 93 ++++++++++++++++++++++++++
 2 files changed, 105 insertions(+), 4 deletions(-)
 create mode 100644 math/tilp2/files/patch-remove-kde.diff

diff --git a/math/tilp2/Portfile b/math/tilp2/Portfile
index 53428aee3e9bd..0c1f1c07de4f4 100644
--- a/math/tilp2/Portfile
+++ b/math/tilp2/Portfile
@@ -1,7 +1,7 @@
 PortSystem          1.0
 
 name                tilp2
-version             1.16
+version             1.18
 license             GPL-2
 categories          math
 maintainers         nomaintainer
@@ -12,13 +12,16 @@ platforms           darwin
 
 master_sites        sourceforge:tilp
 
-checksums           md5     eaea086a5041bb970977de7e65fd9bfa \
-                    sha1    61d26fb1ad4f76df1f8d46369692792da7f6e5a3 \
-                    rmd160  9bfd4ec998679e06b56b94901fce1ef765aa749e
+checksums           rmd160  433edb66a15f1cdb3487c34bbbd2b2ac31570fb7 \
+                    sha256  7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47 \
+                    size    536744
+
+patchfiles          patch-remove-kde.diff
 
 use_bzip2           yes
 
 depends_build       port:pkgconfig \
+                    port:intltool \
                     bin:groff:groff
 
 depends_lib         port:libiconv \
@@ -30,5 +33,10 @@ depends_lib         port:libiconv \
                     port:gtk2 \
                     port:libglade2
 
+use_autoreconf      yes
+
 configure.args      --without-kde
 
+livecheck.type      regex
+livecheck.url       https://sourceforge.net/projects/tilp/rss?path=/tilp2-linux
+livecheck.regex     ${name}-(\\d+(?:\\.\\d+)*)
diff --git a/math/tilp2/files/patch-remove-kde.diff b/math/tilp2/files/patch-remove-kde.diff
new file mode 100644
index 0000000000000..f764ea2117812
--- /dev/null
+++ b/math/tilp2/files/patch-remove-kde.diff
@@ -0,0 +1,93 @@
+--- configure.ac	2016-01-15 12:28:52.000000000 -0800
++++ configure.ac	2019-02-10 21:57:57.000000000 -0800
+@@ -118,24 +118,25 @@
+ CFLAGS="$CFLAGS $ARCH"
+ 
+ # KDE dialogs support
+-AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no])
+-if test "x$kde" = "xdefault"; then
+-  case $host_os in
+-    *mingw*)
+-      kde=no
+-      ;;
+-    *)
+-      kde=yes
+-      ;;
+-  esac
+-fi
+-if test "x$kde" = "xyes"; then
+-        AC_PROG_CXX
+-        AC_PATH_KDE
+-        AC_DEFINE(WITH_KDE, 1, [Use KDE support])
+-fi
+-AM_CONDITIONAL(USE_KDE, test "x$kde" = "xyes")
+-AC_SUBST(kde)
++#AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no])
++#if test "x$kde" = "xdefault"; then
++#  case $host_os in
++#    *mingw*)
++#      kde=no
++#      ;;
++#    *)
++#      kde=yes
++#      ;;
++#  esac
++#fi
++#if test "x$kde" = "xyes"; then
++#        AC_PROG_CXX
++#        AC_PATH_KDE
++#        AC_DEFINE(WITH_KDE, 1, [Use KDE support])
++#fi
++#AM_CONDITIONAL(USE_KDE, test "x$kde" = "xyes")
++#AC_SUBST(kde)
++AC_DEFINE(WITH_KDE, 0, [Use KDE support])
+ 
+ # Ensure MSVC-compatible struct packing convention is used when
+ # compiling for Win32 with gcc.
+--- src/Makefile.am	2016-03-14 12:55:57.000000000 -0700
++++ src/Makefile.am	2019-02-10 22:09:58.000000000 -0800
+@@ -9,16 +9,15 @@
+ tilp_CPPFLAGS = -I$(top_srcdir)/intl \
+ 	@TICABLES_CFLAGS@ @TIFILES_CFLAGS@ @TICALCS_CFLAGS@ @TICONV_CFLAGS@ \
+ 	@GLIB_CFLAGS@ @GTK_CFLAGS@ \
+-	@KDE_INCLUDES@ @QT_INCLUDES@ \
+ 	-DSHARE_DIR=\"$(pkgdatadir)\" \
+ 	-DLOCALEDIR=\"$(datadir)/locale\" \
+ 	-DSYSCONFDIR=\"$(sysconfdir)\" \
+ 	-DGTK_DISABLE_DEPRECATED
++#	@KDE_INCLUDES@ @QT_INCLUDES@
+ tilp_LDFLAGS = -export-dynamic
+ tilp_LDADD = @TICABLES_LIBS@ @TIFILES_LIBS@ @TICALCS_LIBS@ @TICONV_LIBS@ \
+-	@GLIB_LIBS@ @GTK_LIBS@ \
+-	@LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
+-	@QT_LDFLAGS@ @X_LDFLAGS@ @LIBZ@
++	@GLIB_LIBS@ @GTK_LIBS@ @LIBZ@
++#	@LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ @QT_LDFLAGS@ @X_LDFLAGS@
+ tilp_SOURCES = *.h \
+ 	tilp_calcs.c tilp_cmdline.c tilp_config.c tilp_error.c \
+ 	tilp_files.c tilp_gif.c tilp_main.c \
+@@ -36,16 +35,16 @@
+   tilp_LDFLAGS += -Wl,../build/mingw/tilp-rc.o
+ endif
+ 
+-if USE_KDE
+-  tilp_SOURCES += kde.cpp
+-  nodist_tilp_SOURCES = kde-private.cpp
+-  CLEANFILES = kde-private.cpp
+-
+-  kde-private.cpp: kde-private.h
+-	  @MOC@ kde-private.h -o kde-private.cpp
+-else
+-  EXTRA_DIST = kde.cpp
+-endif
++#if USE_KDE
++#  tilp_SOURCES += kde.cpp
++#  nodist_tilp_SOURCES = kde-private.cpp
++#  CLEANFILES = kde-private.cpp
++#
++#  kde-private.cpp: kde-private.h
++#	  @MOC@ kde-private.h -o kde-private.cpp
++#else
++#  EXTRA_DIST = kde.cpp
++#endif
+ 
\ No newline at end of file