*/*: Remove expired ports:

2020-12-31 math/gringo: Uses Python 2.7 which is EOLed upstream
2021-06-23 math/aspcud: Uses EOL Python 2.7 via math/gringo
2021-06-23 math/py-pyasp: Uses EOL Python 2.7 via math/gringo

16 files changed, 3 insertions, 246 deletions

diff --git a/MOVED b/MOVED
index 751a96ba6851..3eed6d271a71 100644
--- a/MOVED
+++ b/MOVED
@@ -16445,3 +16445,6 @@ irc/eggdrop-devel|irc/eggdrop|2021-06-26|Has expired: Use stable version instead
 audio/xmms2||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
 audio/gxmms2||2021-06-26|Has expired: Uses EOL Python 2.7 via audio/xmms2
 audio/lxmusic||2021-06-26|Has expired: Uses EOL Python 2.7 via audio/xmms2
+math/gringo||2021-06-26|Has expired: Uses Python 2.7 which is EOLed upstream
+math/aspcud||2021-06-26|Has expired: Uses EOL Python 2.7 via math/gringo
+math/py-pyasp||2021-06-26|Has expired: Uses EOL Python 2.7 via math/gringo
diff --git a/math/Makefile b/math/Makefile
index 064f5026bba0..95a8a9f19281 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -154,7 +154,6 @@
     SUBDIR += arpack-ng
     SUBDIR += ascent
     SUBDIR += asl
-    SUBDIR += aspcud
     SUBDIR += asymptote
     SUBDIR += atlas
     SUBDIR += barvinok
@@ -336,7 +335,6 @@
     SUBDIR += gravity
     SUBDIR += gretl
     SUBDIR += gri
-    SUBDIR += gringo
     SUBDIR += grpn
     SUBDIR += gsl
     SUBDIR += half
@@ -858,7 +856,6 @@
     SUBDIR += py-pplpy
     SUBDIR += py-primme
     SUBDIR += py-pyFFTW
-    SUBDIR += py-pyasp
     SUBDIR += py-pybloom
     SUBDIR += py-pyclipper
     SUBDIR += py-pycosat
diff --git a/math/aspcud/Makefile b/math/aspcud/Makefile
deleted file mode 100644
index 45ea9215f097..000000000000
--- a/math/aspcud/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Created by: Vsevolod Stakhov <vsevolod@FreeBSD.org>
-
-PORTNAME=	aspcud
-PORTVERSION=	1.9.4
-DISTVERSIONPREFIX=     v
-PORTREVISION=	7
-CATEGORIES=	math ports-mgmt sysutils
-
-MAINTAINER=	vsevolod@FreeBSD.org
-COMMENT=	Advanced solver for package dependencies
-
-LICENSE=	GPLv3
-
-DEPRECATED=	Uses EOL Python 2.7 via math/gringo
-EXPIRATION_DATE=2021-06-23
-
-BUILD_DEPENDS=	re2c:devel/re2c
-LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
-RUN_DEPENDS=	gringo:math/gringo \
-		clasp:math/clasp \
-		bash:shells/bash
-
-USES=		compiler:c++11-lang cmake python:run
-USE_GITHUB=	yes
-GH_ACCOUNT=	potassco
-
-CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man
-
-.include <bsd.port.mk>
diff --git a/math/aspcud/distinfo b/math/aspcud/distinfo
deleted file mode 100644
index 3b6cb91fedd6..000000000000
--- a/math/aspcud/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1532666427
-SHA256 (potassco-aspcud-v1.9.4_GH0.tar.gz) = 3645f08b079e1cc80e24cd2d7ae5172a52476d84e3ec5e6a6c0034492a6ea885
-SIZE (potassco-aspcud-v1.9.4_GH0.tar.gz) = 70030827
diff --git a/math/aspcud/pkg-descr b/math/aspcud/pkg-descr
deleted file mode 100644
index 74a68ff094e2..000000000000
--- a/math/aspcud/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Aspcud is a solver for package dependencies. A package universe and a request
-to install, remove, or upgrade packages have to be encoded in the CUDF format.
-Such a CUDF document can then be passed to aspcud along with an optimization
-criteria to obtain a solution to the given package problem.
-
-WWW: https://potassco.org/aspcud/
diff --git a/math/aspcud/pkg-plist b/math/aspcud/pkg-plist
deleted file mode 100644
index 465b1b83e8cb..000000000000
--- a/math/aspcud/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/aspcud
-bin/cudf2lp
-%%DATADIR%%/misc2012.lp
-%%DATADIR%%/specification.lp
-man/man1/aspcud.1.gz
-man/man1/cudf2lp.1.gz
diff --git a/math/gringo/Makefile b/math/gringo/Makefile
deleted file mode 100644
index 55fb2347c239..000000000000
--- a/math/gringo/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Created by: Vsevolod Stakhov <vsevolod@FreeBSD.org>
-
-PORTNAME=	gringo
-DISTVERSION=	4.5.4
-DISTVERSIONSUFFIX=	-source
-PORTREVISION=	3
-CATEGORIES=	math devel
-MASTER_SITES=	SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	vsevolod@FreeBSD.org
-COMMENT=	Grounding algorithm based on semi-naive database evaluation
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BUILD_DEPENDS=	re2c:devel/re2c
-
-USES=		bison compiler:c++11-lib python:2.7 scons
-MAKE_ARGS=	${MAKE_ENV}
-CXXFLAGS+=	-std=c++11
-MAKE_ENV=	WITH_LUA=no
-
-PLIST_FILES=	bin/${PORTNAME} bin/clingo
-
-do-install:
-	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/build/debug/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/build/debug/clingo ${STAGEDIR}${PREFIX}/bin/clingo
-
-.include <bsd.port.mk>
diff --git a/math/gringo/distinfo b/math/gringo/distinfo
deleted file mode 100644
index ea7b46341f2b..000000000000
--- a/math/gringo/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1532665392
-SHA256 (gringo-4.5.4-source.tar.gz) = 81f8bbbb1b06236778028e5f1b8627ee38a712ec708724112fb08aecf9bc649a
-SIZE (gringo-4.5.4-source.tar.gz) = 1677479
diff --git a/math/gringo/files/patch-SConscript b/math/gringo/files/patch-SConscript
deleted file mode 100644
index 7ec44177f6fa..000000000000
--- a/math/gringo/files/patch-SConscript
+++ /dev/null
@@ -1,74 +0,0 @@
---- SConscript.orig	2015-11-17 11:48:49 UTC
-+++ SConscript
-@@ -171,21 +171,21 @@ DEFS = {}
- failure = False
- 
- if not conf.CheckBison():
--    print 'error: no usable bison version found'
-+    print('error: no usable bison version found')
-     failure = True
- 
- if not conf.CheckRe2c():
--    print 'error: no usable re2c version found'
-+    print('error: no usable re2c version found')
-     failure = True
- 
- if not conf.CheckCXX():
--    print 'error: no usable C++ compiler found'
--    print "Please check the log file for further information: " + log_file
-+    print('error: no usable C++ compiler found')
-+    print("Please check the log file for further information: " + log_file)
-     Exit(1)
- 
- if not conf.CheckSHCXX():
--    print 'error: no usable (shared) C++ compiler found'
--    print "Please check the log file for further information: " + log_file
-+    print('error: no usable (shared) C++ compiler found')
-+    print("Please check the log file for further information: " + log_file)
-     Exit(1)
- 
- with_python = False
-@@ -206,7 +206,7 @@ if env['WITH_LUA'] == "auto":
-     if conf.CheckWithPkgConfig("lua", ["lua", "lua5.1", "lua-5.1", "lua5.2", "lua-5.2", "lua5.3", "lua-5.3"]):
-         with_lua = True
-         DEFS["WITH_LUA"] = 1
--elif env['WITH_LUA']:
-+elif env['WITH_LUA'] != "no":
-     if not conf.CheckLibs("lua", env['WITH_LUA'], "lua.hpp"):
-         failure = True
-     else:
-@@ -241,7 +241,7 @@ if env['WITH_TBB'] == "auto":
-         with_tbb = True
- elif env['WITH_TBB']:
-     if not claspConf.CheckLibs("tbb", env['WITH_TBB'], 'tbb/tbb.h'):
--        print 'error: tbb library not found'
-+        print('error: tbb library not found')
-         failure = True
-     else:
-         with_tbb = True
-@@ -249,7 +249,7 @@ if with_tbb:
-     DEFS["WITH_THREADS"] = 1
-     if claspConf.CheckNeedRT():
-         if not claspConf.CheckLibWithHeader('rt', 'time.h', 'C++'):
--            print 'error: rt library not found'
-+            print('error: rt library not found')
-             failure = True
- 
- claspEnv = claspConf.Finish()
-@@ -267,14 +267,14 @@ if env['WITH_CPPUNIT']:
-     elif testConf.CheckLibs("cppunit", env['WITH_CPPUNIT'], 'cppunit/TestFixture.h'):
-         with_cppunit = True
-     else:
--        print 'error: cppunit library not found'
-+        print('error: cppunit library not found')
-         failure = True
-     testEnv  = testConf.Finish()
- 
- # {{{1 Check configuration
- 
- if failure:
--    print "Please check the log file for further information: " + log_file
-+    print("Please check the log file for further information: " + log_file)
-     Exit(1)
- 
- # {{{1 Opts: Library
diff --git a/math/gringo/files/patch-SConstruct b/math/gringo/files/patch-SConstruct
deleted file mode 100644
index 3d488727f4f8..000000000000
--- a/math/gringo/files/patch-SConstruct
+++ /dev/null
@@ -1,20 +0,0 @@
---- SConstruct.orig	2015-07-13 17:25:17 UTC
-+++ SConstruct
-@@ -19,7 +19,7 @@
- 
- # }}}
- 
--from os import mkdir
-+from os import mkdir, environ
- from os.path import join, exists
- 
- if not exists("build"): mkdir("build")
-@@ -52,7 +52,7 @@ opts.AddVariables(
-     ('WITH_CPPUNIT'  , 'enable target test, running unit tests using cppunit; None, "auto", or library name or test'),
-     )
- 
--env = Environment()
-+env = Environment(ENV = environ)
- env['BISON']          = 'bison'
- env['RE2C']           = 're2c'
- env['CXX']            = 'g++'
diff --git a/math/gringo/files/patch-libgringo_src_term.cc b/math/gringo/files/patch-libgringo_src_term.cc
deleted file mode 100644
index eb0e5fcaf30a..000000000000
--- a/math/gringo/files/patch-libgringo_src_term.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgringo/src/term.cc.orig	2018-09-25 16:02:56 UTC
-+++ libgringo/src/term.cc
-@@ -21,6 +21,7 @@
- #include "gringo/term.hh"
- #include "gringo/logger.hh"
- #include "gringo/graph.hh"
-+#include <cmath>
- 
- namespace Gringo {
- 
diff --git a/math/gringo/pkg-descr b/math/gringo/pkg-descr
deleted file mode 100644
index fed7edffef2f..000000000000
--- a/math/gringo/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Current answer set solvers work on variable-free programs. Hence, a grounder is
-needed that, given an input program with first-order variables, computes an
-equivalent ground (variable-free) program. Gringo is such a grounder. Its
-output can be processed further with clasp.
-
-WWW: https://potassco.org/
diff --git a/math/py-pyasp/Makefile b/math/py-pyasp/Makefile
deleted file mode 100644
index c2cd180d24f6..000000000000
--- a/math/py-pyasp/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-PORTNAME=	pyasp
-DISTVERSION=	1.4.4
-CATEGORIES=	math python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	yuri@FreeBSD.org
-COMMENT=	Convenience wrapper for the ASP tools gringo and clasp
-
-LICENSE=	GPLv3
-
-DEPRECATED=	Uses EOL Python 2.7 via math/gringo
-EXPIRATION_DATE=2021-06-23
-
-RUN_DEPENDS=	clasp:math/clasp \
-		gringo:math/gringo
-
-USES=		python:3.6+
-USE_PYTHON=	distutils autoplist
-
-post-patch:
-	@${REINPLACE_CMD} -e " \
-		s|'bin/'|'${PREFIX}/bin/'| ; \
-		s|'gringo4'|'gringo'| ; \
-		s|access_packaged_file(REL_DIR_BIN + bin_name)|REL_DIR_BIN + bin_name|" \
-		${WRKSRC}/pyasp/constant.py
-
-.include <bsd.port.mk>
diff --git a/math/py-pyasp/distinfo b/math/py-pyasp/distinfo
deleted file mode 100644
index 35966116a3e8..000000000000
--- a/math/py-pyasp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1551570927
-SHA256 (pyasp-1.4.4.tar.gz) = f5525c73353c0e264497795d86ea4db80fd32cd51b7da965f70c46da56b85d37
-SIZE (pyasp-1.4.4.tar.gz) = 51718
diff --git a/math/py-pyasp/files/patch-setup.py b/math/py-pyasp/files/patch-setup.py
deleted file mode 100644
index 5e91e276adcb..000000000000
--- a/math/py-pyasp/files/patch-setup.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- setup.py.orig	2019-03-02 23:56:14 UTC
-+++ setup.py
-@@ -46,7 +46,8 @@ BINARIES_NAME = {
-     # binary remote name: binary local name
-     'clasp-3.1.1': 'clasp',
-     'gringo-3.0.5': 'gringo3',
--    'gringo-5.3.0': 'gringo4',
-+    'gringo-4.5.3': 'gringo',
-+    'gringo-5.3.0': 'gringo',
- }
- 
- BASE_URL_PLATFORM_SPECIFIC_SUBPATHS = {
-@@ -138,7 +139,7 @@ class install(_install):
-     def run(self):
-         """Call superclass run method, then downloads the binaries"""
-         _install.run(self)
--        self.execute(post_install, args=[], msg=post_install.__doc__)
-+        #self.execute(post_install, args=[], msg=post_install.__doc__)
- 
- 
- setup(
diff --git a/math/py-pyasp/pkg-descr b/math/py-pyasp/pkg-descr
deleted file mode 100644
index b1faf75bad24..000000000000
--- a/math/py-pyasp/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-PyASP is a Python convenience wrapper allowing
-to solve boolean satisfiability problems through
-invocation of external commands 'clasp' and 'gringo'.
-
-WWW: https://pypi.org/project/pyasp/