[Midnightbsd-cvs] mports [18093] trunk/Mk/bsd.mport.mk: cleanup more names and minimize diff

[laffer1 at midnightbsd.org]

Revision: 18093
          http://svnweb.midnightbsd.org/mports/?rev=18093
Author:   laffer1
Date:     2015-03-08 19:33:54 -0400 (Sun, 08 Mar 2015)
Log Message:
-----------
cleanup more names and minimize diff

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2015-03-08 23:27:03 UTC (rev 18092)
+++ trunk/Mk/bsd.mport.mk	2015-03-08 23:33:54 UTC (rev 18093)
@@ -35,7 +35,6 @@
 DISTDIR?=		${PORTSDIR}/Distfiles
 _DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
 INDEXDIR?=		${PORTSDIR}
-INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]).*/\1/}
 SRC_BASE?=		/usr/src
 SCRIPTSDIR?=		${PORTSDIR}/Mk/scripts
 LIB_DIRS?=		/lib /usr/lib ${LOCALBASE}/lib
@@ -269,9 +268,9 @@
 _PREMKINCLUDED= yes
 
 .if defined(PORTVERSION)
-.	if ${PORTVERSION:M*[-_,]*}x != x
+.if ${PORTVERSION:M*[-_,]*}x != x
 IGNORE=			PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','
-.	endif
+.endif
 DISTVERSION?=	${PORTVERSION:S/:/::/g}
 .elif defined(DISTVERSION)
 PORTVERSION=	${DISTVERSION:tl:C/([a-z])[a-z]+/\1/g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
@@ -293,8 +292,8 @@
 PKGNAME=	${PKGBASE}-${PKGVERSION}
 DISTNAME?=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
 
+INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]).*/\1/}
 
-
 PKGCOMPATDIR?=	${LOCALBASE}/lib/compat/pkg
 
 #
@@ -4080,8 +4079,9 @@
 			editors)		c="Utility"						;; \
 			emulators)		c="System Emulator"					;; \
 			finance)		c="Office Finance"				;; \
-			ftp)			c="FileTransfer Network"		;; \
+			ftp)			c="Network FileTransfer"		;; \
 			games)			c="Game"						;; \
+			geography)		c="Education Science Geography"	;; \
 			gnome)			c="GNOME GTK"					;; \
 			graphics)		c="Graphics"					;; \
 			hamradio)		c="HamRadio"					;; \
@@ -4088,11 +4088,13 @@
 			haskell)		c="Development"					;; \
 			ipv6)			c="Network"						;; \
 			irc)			c="Network IRCClient"			;; \
-			java)			c="Java Development"			;; \
+			java)			c="Development Java"			;; \
+			kde)			c="KDE Qt"						;; \
 			lang)			c="Development"					;; \
 			lisp)			c="Development"					;; \
 			lua)			c="Development"				;; \
 			mail)			c="Office Email"		;; \
+			math)			c="Education Science Math"		;; \
 			multimedia)		c="AudioVideo"					;; \
 			net)			c="Network"						;; \
 			net-im)			c="Network InstantMessaging"	;; \
@@ -4099,7 +4101,7 @@
 			net-mgmt)		c="Network"						;; \
 			net-p2p)		c="Network P2P"					;; \
 			news)			c="News"						;; \
-			pear)			c="WebDevelopment Development"	;; \
+			pear)			c="Development WebDevelopment"	;; \
 			perl5)			c="Development"					;; \
 			python)			c="Development"					;; \
 			ruby)			c="Development"					;; \
@@ -4111,10 +4113,10 @@
 			sysutils)		c="System Utility"				;; \
 			tcl*|tk*)		c="Development"					;; \
 			www)			c="Network"						;; \
-			x11-clocks)		c="Clock Utility"				;; \
+			x11-clocks)		c="Utility Clock"				;; \
 			x11-fm)			c="FileManager"					;; \
 			xfce)			c="GTK XFCE"							;; \
-			zope)			c="WebDevelopment Development"	;; \
+			zope)			c="Development WebDevelopment"	;; \
 		esac; \
 		if [ -n "$$c" ]; then \
 			categories="$$categories $$c"; \