5 files changed, 7 insertions, 54 deletions

diff --git a/math/aspcud/Makefile b/math/aspcud/Makefile
index e3f68a2baec7..96ad3027cdaa 100644
--- a/math/aspcud/Makefile
+++ b/math/aspcud/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aspcud
-PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTVERSION=	1.9.0
 DISTVERSIONSUFFIX=	-source
 CATEGORIES=	math ports-mgmt sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -21,17 +20,8 @@ RUN_DEPENDS=	gringo:${PORTSDIR}/math/gringo \
 				bash:${PORTSDIR}/shells/bash
 
 USE_PYTHON_RUN=	yes
-USES=	compiler:c++11-lang cmake:outsource shebangfix
-SHEBANG_FILES=	${WRKSRC}/scripts/aspcud.sh
+USES=	compiler:c++11-lang cmake:outsource
 
-post-patch:
-	${REINPLACE_CMD} -e 's|@@PREFIX@@|${PREFIX}|' ${WRKSRC}/scripts/${PORTNAME}.sh
-
-do-install:
-	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/cudf2lp ${STAGEDIR}${PREFIX}/bin/cudf2lp
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/scripts/encodings/misc2012.lp ${STAGEDIR}${DATADIR}/misc2012.lp
-	${INSTALL_DATA} ${WRKSRC}/scripts/encodings/specification.lp ${STAGEDIR}${DATADIR}/specification.lp
+CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man
 
 .include <bsd.port.mk>
diff --git a/math/aspcud/distinfo b/math/aspcud/distinfo
index f33061858ad4..691e6e60fd29 100644
--- a/math/aspcud/distinfo
+++ b/math/aspcud/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aspcud-1.8.0-source.tar.gz) = 491c42a8e769c6d244f106021df4c61344b53c5e133837b0589b4d384bf9d17b
-SIZE (aspcud-1.8.0-source.tar.gz) = 96121
+SHA256 (aspcud-1.9.0-source.tar.gz) = e38c0a5c2622a7ba6f0ae0e575f11b47ff126f44d188e0b43ea2ccc676192009
+SIZE (aspcud-1.9.0-source.tar.gz) = 110360
diff --git a/math/aspcud/files/patch-libcudf-src-dependency.cpp b/math/aspcud/files/patch-libcudf-src-dependency.cpp
deleted file mode 100644
index 7ae476f51077..000000000000
--- a/math/aspcud/files/patch-libcudf-src-dependency.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- libcudf/src/dependency.cpp.orig	2014-01-10 15:13:07.000000000 +0000
-+++ libcudf/src/dependency.cpp	2014-01-10 15:29:32.000000000 +0000
-@@ -49,6 +49,7 @@
-     struct CudfPackageRefFilter
-     {
-         CudfPackageRefFilter(const Cudf::PackageRef &ref) : ref(ref) { }
-+		CudfPackageRefFilter &operator = (const CudfPackageRefFilter &t) { return *this; } 
-         bool operator()(const Entity *entity)
-         {
-             switch(ref.op)
diff --git a/math/aspcud/files/patch-scripts-aspcud.sh b/math/aspcud/files/patch-scripts-aspcud.sh
deleted file mode 100644
index cd303f30896f..000000000000
--- a/math/aspcud/files/patch-scripts-aspcud.sh
+++ /dev/null
@@ -1,29 +0,0 @@
---- scripts/aspcud.sh.orig	2014-01-10 16:00:28.000000000 +0000
-+++ scripts/aspcud.sh	2014-01-10 16:25:29.000000000 +0000
-@@ -7,7 +7,7 @@
- 
- function enc()
- {
--	for x in "." "$base" "$base/encodings"; do
-+	for x in "@@PREFIX@@/share/aspcud"; do
- 		[[ -e "$x/$1" ]] && { echo "$x/$1"; return 0; }
- 	done
- 	echo "$x"
-@@ -27,7 +27,7 @@
- 
- function usage()
- {
--	echo "Usage: ${0} [OPTION]... CUDFIN CUDFOUT [CRITERIA]"
-+	echo "Usage: ${0} [OPTION]... CUDFIN CUDFOUT CRITERIA"
- 	echo "  -h       print this help"
- 	echo "  -c OPT   append clasp option OPT"
- 	echo "  -e ENC   append encoding ENC"
-@@ -135,7 +135,7 @@
- trap usrtrap USR1 TERM INT
- 
- cat <<EOF > "$tmp/parse.py"
--#!/usr/bin/python
-+#!/usr/bin/env python
- import signal, re, sys
- 
- def ignore(x, y): pass
diff --git a/math/aspcud/pkg-plist b/math/aspcud/pkg-plist
index 80d0b2c46017..bd021d71948b 100644
--- a/math/aspcud/pkg-plist
+++ b/math/aspcud/pkg-plist
@@ -2,4 +2,6 @@ bin/aspcud
 bin/cudf2lp
 %%DATADIR%%/misc2012.lp
 %%DATADIR%%/specification.lp
+man/man1/aspcud.1.gz
+man/man1/cudf2lp.1.gz
 @dirrmtry %%DATADIR%%