diff --git a/math/minisat/Portfile b/math/minisat/Portfile
index a13c94f2823ff..66497babe0911 100644
--- a/math/minisat/Portfile
+++ b/math/minisat/Portfile
@@ -1,52 +1,25 @@
-PortSystem 1.0
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
-name                minisat
-version             2.2.0
-revision            1
-categories          math science
-platforms           darwin
-maintainers         nomaintainer
-homepage            http://minisat.se/
-license             MIT
-description         Minimalistic SAT solver
-long_description    MiniSat is a minimalistic, open-source SAT solver, \
-                    developed to help researchers and developers alike to get \
-                    started on SAT.
+PortSystem              1.0
+PortGroup               github 1.0
+PortGroup               cmake 1.1
 
-master_sites        http://minisat.se/downloads/
+github.setup            stp minisat 2.2.1 releases/
+github.tarball_from     archive
+revision                0
+categories              math science
+maintainers             nomaintainer
+homepage                http://minisat.se/
+license                 MIT
 
-patchfiles          patch-friend-declaration.diff \
-                    patch-mtl-template.mk.diff \
-                    patch-simp-Makefile.diff \
-                    patch-utils-System.cc.diff
+description             Minimalistic SAT solver
+long_description        MiniSat is a minimalistic, open-source SAT solver, developed to \
+                        help researchers and developers alike to get started on SAT.
 
-checksums           rmd160  169ec9116befa9067db9076d26309f7e9ab408dd \
-                    sha256  92957d851cdc3baddfe07b5fc80ed5a0237c489d0c52ae72f62844b3b46d7808
+checksums               rmd160  1e9583e808832fdb144d72bf25b67878a42fbf70 \
+                        sha256  432985833596653fcd698ab439588471cc0f2437617d0df2bb191a0252ba423d \
+                        size    50485
 
-depends_lib         port:zlib
+depends_lib-append      port:zlib
 
-installs_libs       no
-
-worksrcdir          minisat
-
-post-extract {
-    xinstall -m 755 ${filespath}/configure ${worksrcpath}/simp
-}
-
-configure.dir        ${worksrcpath}/simp
-
-build.target         rs
-build.args           MROOT="${worksrcpath}"
-build.dir            ${configure.dir}
-
-destroot {
-    xinstall -m 755 -d ${destroot}${prefix}/bin \
-        ${destroot}${prefix}/share/doc/${name}
-    xinstall -m 755 ${worksrcpath}/simp/minisat_static ${destroot}${prefix}/bin/minisat
-    xinstall -m 644 -W ${worksrcpath} README LICENSE doc/ReleaseNotes-${version}.txt \
-        ${destroot}${prefix}/share/doc/${name}
-}
-
-livecheck.type       regex
-livecheck.url        http://minisat.se/MiniSat.html
-livecheck.regex      minisat-(\[0-9\.\]+).tar.gz
+configure.args-append   -DSTATIC_BINARIES=OFF
diff --git a/math/minisat/files/configure b/math/minisat/files/configure
deleted file mode 100644
index 8ad0b13e8ff7b..0000000000000
--- a/math/minisat/files/configure
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-echo "CXX=${CXX:-c++} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" > Makefile.conf
-
diff --git a/math/minisat/files/patch-friend-declaration.diff b/math/minisat/files/patch-friend-declaration.diff
deleted file mode 100644
index ace5182b01e60..0000000000000
--- a/math/minisat/files/patch-friend-declaration.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/minisat/core/SolverTypes.h b/minisat/core/SolverTypes.h
-index 89986d1..aa45ddb 100644
---- core/SolverTypes.h
-+++ core/SolverTypes.h
-@@ -52,7 +52,7 @@ struct Lit {
-     int     x;
- 
-     // Use this as a constructor:
--    friend Lit mkLit(Var var, bool sign = false);
-+    friend Lit mkLit(Var var, bool sign);
- 
-     bool operator == (Lit p) const { return x == p.x; }
-     bool operator != (Lit p) const { return x != p.x; }
-@@ -60,7 +60,7 @@ struct Lit {
- };
- 
- 
--inline  Lit  mkLit     (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
-+inline  Lit  mkLit     (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; }
- inline  Lit  operator ~(Lit p)              { Lit q; q.x = p.x ^ 1; return q; }
- inline  Lit  operator ^(Lit p, bool b)      { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
- inline  bool sign      (Lit p)              { return p.x & 1; }
diff --git a/math/minisat/files/patch-mtl-template.mk.diff b/math/minisat/files/patch-mtl-template.mk.diff
deleted file mode 100644
index f4d46a44fd5e9..0000000000000
--- a/math/minisat/files/patch-mtl-template.mk.diff
+++ /dev/null
@@ -1,59 +0,0 @@
---- mtl/template.mk	2010-07-10 18:07:36.000000000 +0200
-+++ mtl/template.mk	2011-09-05 18:30:15.000000000 +0200
-@@ -51,7 +51,7 @@
- $(EXEC)_profile:	LFLAGS += -g -pg
- $(EXEC)_debug:		LFLAGS += -g
- #$(EXEC)_release:	LFLAGS += ...
--$(EXEC)_static:		LFLAGS += --static
-+$(EXEC)_static:		LFLAGS +=
- 
- ## Dependencies
- $(EXEC):		$(COBJS)
-@@ -68,35 +68,35 @@
- 
- ## Build rule
- %.o %.op %.od %.or:	%.cc
--	@echo Compiling: $(subst $(MROOT)/,,$@)
--	@$(CXX) $(CFLAGS) -c -o $@ $<
-+	echo Compiling: $(subst $(MROOT)/,,$@)
-+	$(CXX) $(CFLAGS) -c -o $@ $<
- 
- ## Linking rules (standard/profile/debug/release)
- $(EXEC) $(EXEC)_profile $(EXEC)_debug $(EXEC)_release $(EXEC)_static:
--	@echo Linking: "$@ ( $(foreach f,$^,$(subst $(MROOT)/,,$f)) )"
--	@$(CXX) $^ $(LFLAGS) -o $@
-+	echo Linking: "$@ ( $(foreach f,$^,$(subst $(MROOT)/,,$f)) )"
-+	$(CXX) $^ $(LFLAGS) -o $@
- 
- ## Library rules (standard/profile/debug/release)
- lib$(LIB)_standard.a lib$(LIB)_profile.a lib$(LIB)_release.a lib$(LIB)_debug.a:
--	@echo Making library: "$@ ( $(foreach f,$^,$(subst $(MROOT)/,,$f)) )"
--	@$(AR) -rcsv $@ $^
-+	echo Making library: "$@ ( $(foreach f,$^,$(subst $(MROOT)/,,$f)) )"
-+	$(AR) -rcsv $@ $^
- 
- ## Library Soft Link rule:
- libs libp libd libr:
--	@echo "Making Soft Link: $^ -> lib$(LIB).a"
--	@ln -sf $^ lib$(LIB).a
-+	echo "Making Soft Link: $^ -> lib$(LIB).a"
-+	ln -sf $^ lib$(LIB).a
- 
- ## Clean rule
- clean:
--	@rm -f $(EXEC) $(EXEC)_profile $(EXEC)_debug $(EXEC)_release $(EXEC)_static \
-+	rm -f $(EXEC) $(EXEC)_profile $(EXEC)_debug $(EXEC)_release $(EXEC)_static \
- 	  $(COBJS) $(PCOBJS) $(DCOBJS) $(RCOBJS) *.core depend.mk 
- 
- ## Make dependencies
- depend.mk: $(CSRCS) $(CHDRS)
--	@echo Making dependencies
--	@$(CXX) $(CFLAGS) -I$(MROOT) \
-+	echo Making dependencies
-+	$(CXX) $(CFLAGS) -I$(MROOT) \
- 	   $(CSRCS) -MM | sed 's|\(.*\):|$(PWD)/\1 $(PWD)/\1r $(PWD)/\1d $(PWD)/\1p:|' > depend.mk
--	@for dir in $(DEPDIR); do \
-+	for dir in $(DEPDIR); do \
- 	      if [ -r $(MROOT)/$${dir}/depend.mk ]; then \
- 		  echo Depends on: $${dir}; \
- 		  cat $(MROOT)/$${dir}/depend.mk >> depend.mk; \
diff --git a/math/minisat/files/patch-simp-Makefile.diff b/math/minisat/files/patch-simp-Makefile.diff
deleted file mode 100644
index a4e6df90c77d5..0000000000000
--- a/math/minisat/files/patch-simp-Makefile.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- simp/Makefile	2010-07-10 18:07:36.000000000 +0200
-+++ simp/Makefile	2011-09-08 12:51:53.000000000 +0200
-@@ -1,4 +1,5 @@
- EXEC      = minisat
- DEPDIR    = mtl utils core
- 
-+include Makefile.conf
- include $(MROOT)/mtl/template.mk
diff --git a/math/minisat/files/patch-utils-System.cc.diff b/math/minisat/files/patch-utils-System.cc.diff
deleted file mode 100644
index 4d47fe6ad24c6..0000000000000
--- a/math/minisat/files/patch-utils-System.cc.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/System.cc	2010-07-10 18:07:36.000000000 +0200
-+++ utils/System.cc	2011-09-05 18:44:07.000000000 +0200
-@@ -88,6 +88,7 @@
-     malloc_statistics_t t;
-     malloc_zone_statistics(NULL, &t);
-     return (double)t.max_size_in_use / (1024*1024); }
-+double Minisat::memUsedPeak(void) { return memUsed(); }
- 
- #else
- double Minisat::memUsed() {