Cleanup GH_* and variables order.

Sponsored by:	Absolight

17 files changed, 8 insertions, 18 deletions

diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index c2825b8..2cc3ad1 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	aegis
 PORTVERSION=	4.25
+DISTVERSIONSUFFIX=	.D510
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF
-DISTVERSIONSUFFIX=	.D510
 
 MAINTAINER=	aryeh.friedman@gmail.com
 COMMENT=	Transaction-based software configuration management system
diff --git a/devel/caf/Makefile b/devel/caf/Makefile
index fc2f091..ca24cb4 100644
--- a/devel/caf/Makefile
+++ b/devel/caf/Makefile
@@ -20,7 +20,6 @@ TEST_TARGET=	test
 TEST_WRKSRC=	${BUILD_WRKSRC}
 USE_GITHUB=	yes
 GH_ACCOUNT=	actor-framework
-GH_PROJECT=	${GH_ACCOUNT}
 
 BROKEN_FreeBSD_8=	"undefined reference to `iswalpha_l'"
 
diff --git a/devel/cc65/Makefile b/devel/cc65/Makefile
index dc69ffd..7e41f72 100644
--- a/devel/cc65/Makefile
+++ b/devel/cc65/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	cc65
 PORTVERSION=	2.13.3
-PORTREVISION=	1
 DISTVERSIONPREFIX=	sources-
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://bj.spline.de/cc65/ \
 		http://cc65.oldos.net/ \
diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile
index 6df1cff..c5de146 100644
--- a/devel/dmake/Makefile
+++ b/devel/dmake/Makefile
@@ -12,7 +12,6 @@ LICENSE=	GPLv1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mohawk2
-GH_PROJECT=	dmake
 GH_TAGNAME=	e5588b0
 
 USES=		autoreconf:autoconf
diff --git a/devel/erlang-gpb/Makefile b/devel/erlang-gpb/Makefile
index dd67ef6..136627f 100644
--- a/devel/erlang-gpb/Makefile
+++ b/devel/erlang-gpb/Makefile
@@ -17,7 +17,6 @@ SUB_LIST+=	PORTNAME=${PORTNAME} \
 USES=		erlang:rebar
 USE_GITHUB=	yes
 GH_ACCOUNT=	tomas-abrahamsson
-GH_PROJECT=	gpb
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ERL_APP_ROOT}/bin
diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index 24f8854..a739008 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -2,10 +2,10 @@
 
 PORTNAME=	fossil
 PORTVERSION=	1.34
+DISTVERSIONPREFIX=	src-
 PORTEPOCH=	2
 CATEGORIES=	devel www
 MASTER_SITES=	http://www.fossil-scm.org/download/
-DISTVERSIONPREFIX=	src-
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	DSCM with built-in wiki, http interface and server, tickets database
diff --git a/devel/godep/Makefile b/devel/godep/Makefile
index 5da08e4..a8c8814 100644
--- a/devel/godep/Makefile
+++ b/devel/godep/Makefile
@@ -11,7 +11,6 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tools
-GH_PROJECT=	godep
 GH_TAGNAME=	d8799f1
 
 PLIST_FILES=	bin/godep
diff --git a/devel/ivykis/Makefile b/devel/ivykis/Makefile
index 2ed3d8f..93da438 100644
--- a/devel/ivykis/Makefile
+++ b/devel/ivykis/Makefile
@@ -16,7 +16,6 @@ GNU_CONFIGURE=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	buytenh
-GH_PROJECT=	ivykis
 
 post-stage:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
diff --git a/devel/liblas/Makefile b/devel/liblas/Makefile
index bc33229..dfd009e 100644
--- a/devel/liblas/Makefile
+++ b/devel/liblas/Makefile
@@ -20,6 +20,5 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	libLAS
-GH_PROJECT=	${GH_ACCOUNT}
 
 .include <bsd.port.mk>
diff --git a/devel/libnaji/Makefile b/devel/libnaji/Makefile
index 55d9fba..0e3adc0 100644
--- a/devel/libnaji/Makefile
+++ b/devel/libnaji/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libnaji
 PORTVERSION=	0.6.4
+DISTVERSIONSUFFIX=	.src
 CATEGORIES=	devel
 MASTER_SITES=	SF/najitool/${PORTNAME}/${PORTVERSION}
 
@@ -11,8 +12,6 @@ COMMENT=	Library that generates, converts, and filters files
 
 MAKE_ARGS=	cc="${CC}"
 
-DISTVERSIONSUFFIX=	.src
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libnaji.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/libnaji.a ${STAGEDIR}${PREFIX}/lib
diff --git a/devel/msgpuck/Makefile b/devel/msgpuck/Makefile
index c003ce7..ee724bb 100644
--- a/devel/msgpuck/Makefile
+++ b/devel/msgpuck/Makefile
@@ -11,7 +11,6 @@ COMMENT=	MsgPack binary serialization library in a self-contained header
 LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
-GH_PROJECT=	msgpuck
 GH_ACCOUNT=	tarantool
 
 USES=		cmake
diff --git a/devel/oniguruma5/Makefile b/devel/oniguruma5/Makefile
index a69776f..8b41c99 100644
--- a/devel/oniguruma5/Makefile
+++ b/devel/oniguruma5/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	oniguruma
 PORTVERSION=	5.9.6
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel textproc
 PKGNAMESUFFIX=	5
 DISTNAME=	onig-${PORTVERSION}
diff --git a/devel/rapidjson/Makefile b/devel/rapidjson/Makefile
index 19fefe1..0f7b6dd 100644
--- a/devel/rapidjson/Makefile
+++ b/devel/rapidjson/Makefile
@@ -16,7 +16,6 @@ LICENSE_PERMS=	${_LICENSE_PERMS_DEFAULT}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	miloyip
-GH_PROJECT=	rapidjson
 
 USES=		cmake gmake
 
diff --git a/devel/rlwrap/Makefile b/devel/rlwrap/Makefile
index 3ae435c..0c2d3da 100644
--- a/devel/rlwrap/Makefile
+++ b/devel/rlwrap/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hanslub42
-GH_PROJECT=	${PORTNAME}
 
 USES=		readline autoreconf
 GNU_CONFIGURE=	yes
diff --git a/devel/unibilium/Makefile b/devel/unibilium/Makefile
index 867f217..757cae4 100644
--- a/devel/unibilium/Makefile
+++ b/devel/unibilium/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	unibilium
 PORTVERSION=	1.1.2
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	antont@inbox.lv
diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile
index b96749b..1e451fb 100644
--- a/devel/valgrind-devel/Makefile
+++ b/devel/valgrind-devel/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	valgrind
-DISTVERSIONPREFIX=	freebsd-
 PORTVERSION=	3.10.0.20150126
+DISTVERSIONPREFIX=	freebsd-
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 4f0d7aa..39f7f50 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	valgrind
-DISTVERSIONPREFIX=	freebsd-
 PORTVERSION=	3.10.0.20150126
+DISTVERSIONPREFIX=	freebsd-
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel