Move picosat and py-pycosat from devel -> math

- Remove from devel/Makefile
- Add to math/Makefile
- Update CATEGORIES for both ports
- Add MOVED entries

While I'm here, sort MOVED entries causing MOVEDlint.awk error [1]
after r365599 [2]

[1] 6470: date going backwards from 2014-08-20 to 2014-08-15
[2] https://svnweb.freebsd.org/changeset/ports/365599

Suggested by:	vsevolod

MOVED

@@ -6419,6 +6419,15 @@ korean/unzip|archivers/unzip|2014-08-15|Merged with archivers/unzip as a new non
 russian/unzip|archivers/unzip|2014-08-15|Merged with archivers/unzip as a new non-default option
 mail/sendmail-sasl|mail/sendmail|2014-08-15|Removed: Use mail/sendmail instead
 print/cups-samba||2014-08-15|Removed: defunct for long, disappeared upstream
+databases/db4|databases/db48|2014-08-15|Superseded by databases/db48
+databases/db41|databases/db48|2014-08-15|Superseded by databases/db48
+databases/db41-nocrypto|databases/db48|2014-08-15|Superseded by databases/db48
+databases/db42|databases/db48|2014-08-15|Superseded by databases/db48
+databases/db42-nocrypto|databases/db48|2014-08-15|Superseded by databases/db48
+databases/db43|databases/db48|2014-08-15|Superseded by databases/db48
+databases/db44|databases/db48|2014-08-15|Superseded by databases/db48
+databases/db46|databases/db48|2014-08-15|Superseded by databases/db48
+databases/db47|databases/db48|2014-08-15|Superseded by databases/db48
 security/sguil-client|security/sguil|2014-08-16|Merged into new port security/sguil
 security/sguil-sensor|security/sguil|2014-08-16|Merged into new port security/sguil
 security/sguil-server|security/sguil|2014-08-16|Merged into new port security/sguil
@@ -6467,15 +6476,6 @@ deskutils/horde3-nag||2014-08-20|Has expired: EOL in April 2012
 devel/horde3-whups||2014-08-20|Has expired: EOL in April 2012
 mail/horde3-imp||2014-08-20|Has expired: EOL in April 2012
 www/horde3-base||2014-08-20|Has expired: EOL in April 2012
-databases/db4|databases/db48|2014-08-15|Superseded by databases/db48
-databases/db41|databases/db48|2014-08-15|Superseded by databases/db48
-databases/db41-nocrypto|databases/db48|2014-08-15|Superseded by databases/db48
-databases/db42|databases/db48|2014-08-15|Superseded by databases/db48
-databases/db42-nocrypto|databases/db48|2014-08-15|Superseded by databases/db48
-databases/db43|databases/db48|2014-08-15|Superseded by databases/db48
-databases/db44|databases/db48|2014-08-15|Superseded by databases/db48
-databases/db46|databases/db48|2014-08-15|Superseded by databases/db48
-databases/db47|databases/db48|2014-08-15|Superseded by databases/db48
 print/tex-omegaware-old||2014-08-22|Deprecated in favor of print/tex-aleph
 databases/pg_filedump||2014-08-22|Has expired: Broken for more than 6 months
 devel/svnmerge||2014-08-22|Has expired: Broken for more than 6 months
@@ -6489,3 +6489,5 @@ devel/rubygem-railsless-deploy||2014-08-22|Removed: Obsolete, Capistrano 3 does
 lang/gcc410|lang/gcc5|2014-08-22|Renamed to GCC 5 upstream
 security/pam_abl||2014-08-24|Has expired: Newer version requires large number of hacks, not worth the effort
 www/rubygem-feedzirra|www/rubygem-feedjira|2014-08-24|Has expired: Project renamed upstream, see www/rubygem-feedjira
+devel/picosat|math/picosat|2014-08-25|More appropriate primary category
+devel/py-pycosat|math/py-pycosat|2014-08-25|More appropriate primary category

devel/Makefile

@@ -3463,7 +3463,6 @@
     SUBDIR += phptags
     SUBDIR += physfs
     SUBDIR += physfs-devel
-    SUBDIR += picosat
     SUBDIR += picp
     SUBDIR += picprog
     SUBDIR += piklab
@@ -3831,7 +3830,6 @@
     SUBDIR += py-pycalendar
     SUBDIR += py-pycallgraph
     SUBDIR += py-pycerberus
-    SUBDIR += py-pycosat
     SUBDIR += py-pycparser
     SUBDIR += py-pydasm
     SUBDIR += py-pyechonest

math/Makefile

@@ -530,6 +530,7 @@
     SUBDIR += php55-bcmath
     SUBDIR += php55-gmp
     SUBDIR += physcalc
+    SUBDIR += picosat
     SUBDIR += plman
     SUBDIR += ploticus
     SUBDIR += ploticus-nox11
@@ -571,6 +572,7 @@
     SUBDIR += py-plastex
     SUBDIR += py-probstat
     SUBDIR += py-pybloom
+    SUBDIR += py-pycosat
     SUBDIR += py-pymc
     SUBDIR += py-roman
     SUBDIR += py-scientific

math/picosat/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	picosat
 DISTVERSION=	957
-CATEGORIES=	devel math
+CATEGORIES=	math
 MASTER_SITES=	http://fmv.jku.at/picosat/
 
 MAINTAINER=	koobs@FreeBSD.org

math/py-pycosat/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	pycosat
 PORTVERSION=	0.6.0
-CATEGORIES=	devel math python
+CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}