0 files changed, 0 insertions, 0 deletions
diff --git a/archivers/brotli/Makefile b/archivers/brotli/Makefile
index c741606f2f0..b9d5ad5ab4a 100644
--- a/archivers/brotli/Makefile
+++ b/archivers/brotli/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	brotli
 PORTVERSION=	0.2.0
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/archivers/liblz4/Makefile b/archivers/liblz4/Makefile
index 29dcc285464..9ea2d2e50a5 100644
--- a/archivers/liblz4/Makefile
+++ b/archivers/liblz4/Makefile
@@ -16,7 +16,6 @@ LICENSE_COMB=	multi
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cyan4973
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}
 USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
 
diff --git a/astro/wmjupiter/Makefile b/astro/wmjupiter/Makefile
index e59aecc1569..5f18ff350eb 100644
--- a/astro/wmjupiter/Makefile
+++ b/astro/wmjupiter/Makefile
@@ -13,7 +13,6 @@ LICENSE_COMB=	dual
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	engerim42
-GH_PROJECT=	${PORTNAME}
 
 PLIST_FILES=	bin/wmJupiter
 USE_XORG=	x11 xext xpm
diff --git a/astro/wmsolar/Makefile b/astro/wmsolar/Makefile
index 0c24f564892..4460d1c563b 100644
--- a/astro/wmsolar/Makefile
+++ b/astro/wmsolar/Makefile
@@ -12,7 +12,6 @@ LICENSE=	GPLv2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	engerim42
-GH_PROJECT=	${PORTNAME}
 
 PLIST_FILES=	bin/wmSolar
 USE_XORG=	x11 xext xpm
diff --git a/audio/praat/Makefile b/audio/praat/Makefile
index c1704038134..bbd8a9056d2 100644
--- a/audio/praat/Makefile
+++ b/audio/praat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	praat
 PORTVERSION=	5.4.08
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	audio science
 
@@ -12,9 +13,6 @@ COMMENT=	Phonetics by Computer
 LICENSE=	GPLv2
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	praat
-GH_PROJECT=	praat
-GH_TAGNAME=	v${PORTVERSION}
 DOS2UNIX_REGEX=	.*Makefile
 USES=		dos2unix iconv pkgconfig
 USE_GNOME=	gtk20
diff --git a/audio/praat/distinfo b/audio/praat/distinfo
index 641a5aeb249..f352b1782ea 100644
--- a/audio/praat/distinfo
+++ b/audio/praat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (praat-praat-5.4.08-v5.4.08_GH0.tar.gz) = 820f6c6e43a46c565778c2494fef6de3b0c5100e78ae5e2979194619c332e165
-SIZE (praat-praat-5.4.08-v5.4.08_GH0.tar.gz) = 6973960
+SHA256 (praat-praat-v5.4.08_GH0.tar.gz) = 820f6c6e43a46c565778c2494fef6de3b0c5100e78ae5e2979194619c332e165
+SIZE (praat-praat-v5.4.08_GH0.tar.gz) = 6973960
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 79e570cb843..2604c855646 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	xmms2
 PORTVERSION=	0.8
-DISTVERSIONSUFFIX=DrO_o
+DISTVERSIONSUFFIX=	DrO_o
 PORTREVISION?=	17
 CATEGORIES?=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
diff --git a/benchmarks/smhasher/Makefile b/benchmarks/smhasher/Makefile
index 41f318fa302..4661f9c7f92 100644
--- a/benchmarks/smhasher/Makefile
+++ b/benchmarks/smhasher/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	smhasher
 PORTVERSION=	1.0
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	benchmarks
 
@@ -13,8 +14,6 @@ LICENSE=	MIT
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gvnn3
-GH_PROJECT=	smhasher
-DISTVERSIONPREFIX=	v
 
 USES=		cmake
 
diff --git a/biology/fastx-toolkit/Makefile b/biology/fastx-toolkit/Makefile
index 26e5da66c43..67a7c846d85 100644
--- a/biology/fastx-toolkit/Makefile
+++ b/biology/fastx-toolkit/Makefile
@@ -18,7 +18,6 @@ SHEBANG_FILES=	scripts/*.pl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	agordon
-GH_PROJECT=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
 
diff --git a/biology/lamarc/Makefile b/biology/lamarc/Makefile
index 75d9ddc6562..2e5e3b0b3c1 100644
--- a/biology/lamarc/Makefile
+++ b/biology/lamarc/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	lamarc
 PORTVERSION=	2.1.8
-PORTREVISION=	1
 DISTVERSIONSUFFIX=	-src
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	http://evolution.genetics.washington.edu/lamarc/download/
diff --git a/biology/libgtextutils/Makefile b/biology/libgtextutils/Makefile
index 1293a018650..1cc106ef7e7 100644
--- a/biology/libgtextutils/Makefile
+++ b/biology/libgtextutils/Makefile
@@ -16,7 +16,6 @@ USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	agordon
-GH_PROJECT=	libgtextutils
 
 INSTALL_TARGET=	install-strip
 
diff --git a/cad/ghdl/Makefile b/cad/ghdl/Makefile
index 8ad8df7b4b8..4e80573b650 100644
--- a/cad/ghdl/Makefile
+++ b/cad/ghdl/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
 USES=		ada gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	tgingold
-GH_PROJECT=	ghdl
 
 GNU_CONFIGURE=	yes
 GCCVER=		4.9.2
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index f1e4d37cf5d..42064cf09ed 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	cqrlog
 PORTVERSION=	1.9.0
-PORTREVISION=	5
 DISTVERSIONPREFIX=	v
+PORTREVISION=	5
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
diff --git a/comms/dump1090_mr/Makefile b/comms/dump1090_mr/Makefile
index 6bc0b21e409..62595ecc845 100644
--- a/comms/dump1090_mr/Makefile
+++ b/comms/dump1090_mr/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	dump1090_mr
 PORTVERSION=	1.15
+DISTVERSIONPREFIX= v
 PORTREVISION=	1
 CATEGORIES=	comms
 
@@ -14,8 +15,6 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	librtlsdr.so:${PORTSDIR}/comms/rtl-sdr
 
-DISTVERSIONPREFIX= v
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware
 
diff --git a/comms/geoid/Makefile b/comms/geoid/Makefile
index 364f38b623a..d73ced4749a 100644
--- a/comms/geoid/Makefile
+++ b/comms/geoid/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	geoid
 PORTVERSION=	1.0
-PORTREVISION=	7
 DISTVERSIONSUFFIX=	.src
+PORTREVISION=	7
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/LinuxApps/ \
 		LOCAL/db
diff --git a/databases/gomdb/Makefile b/databases/gomdb/Makefile
index b58a8a6a373..11080f1fc66 100644
--- a/databases/gomdb/Makefile
+++ b/databases/gomdb/Makefile
@@ -17,7 +17,6 @@ USES=		compiler
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	szferi
-GH_PROJECT=	gomdb
 GH_TAGNAME=	6bcb5a
 
 .include <bsd.port.pre.mk>
diff --git a/databases/jlog/Makefile b/databases/jlog/Makefile
index 1e8037af2b6..7e1fba8ee10 100644
--- a/databases/jlog/Makefile
+++ b/databases/jlog/Makefile
@@ -16,7 +16,6 @@ BUILD_DEPENDS=	autoconf-2.13:${PORTSDIR}/devel/autoconf213
 USE_GITHUB=	yes
 GH_ACCOUNT=	omniti-labs
 # cf3085fe contains c++ fixes and other additions over the 1.2.2 release
-GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	cf3085f
 
 GNU_CONFIGURE=	yes
diff --git a/databases/levigo/Makefile b/databases/levigo/Makefile
index b144a716d01..70cb01374a4 100644
--- a/databases/levigo/Makefile
+++ b/databases/levigo/Makefile
@@ -18,7 +18,6 @@ USES=		compiler
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jmhodges
-GH_PROJECT=	levigo
 GH_TAGNAME=	1ddad808d4
 
 BROKEN_FreeBSD_8=	Build has leftover /readelf.core, PR 194986
diff --git a/databases/mysql-workbench52/Makefile b/databases/mysql-workbench52/Makefile
index 4b7ee2a5ec8..81577b0035b 100644
--- a/databases/mysql-workbench52/Makefile
+++ b/databases/mysql-workbench52/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	mysql-workbench-gpl
 PORTVERSION=	5.2.47
-PORTREVISION=	7
 DISTVERSIONSUFFIX=	-src
+PORTREVISION=	7
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/MySQLGUITools
 PKGNAMESUFFIX=	52
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index ffe2f47b405..ab707041c96 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	MySQLdb
-DISTVERSION=	1.2.5
 DISTVERSIONPREFIX=	${PORTNAME}-
+DISTVERSION=	1.2.5
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/databases/sqlbuddy/Makefile b/databases/sqlbuddy/Makefile
index 17850d91716..b8dfd0eb335 100644
--- a/databases/sqlbuddy/Makefile
+++ b/databases/sqlbuddy/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	deliciousbrains
-GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	b2cdc2b
 
 NO_BUILD=	yes
diff --git a/databases/sqlcipher/Makefile b/databases/sqlcipher/Makefile
index c591b1fc889..0924742cef8 100644
--- a/databases/sqlcipher/Makefile
+++ b/databases/sqlcipher/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	sqlcipher
 PORTVERSION=	3.2.0
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	jharris@widomaker.com
diff --git a/deskutils/gnome-shell-extension-lockkeys/Makefile b/deskutils/gnome-shell-extension-lockkeys/Makefile
index 0071eaf748a..38b39c321f8 100644
--- a/deskutils/gnome-shell-extension-lockkeys/Makefile
+++ b/deskutils/gnome-shell-extension-lockkeys/Makefile
@@ -22,7 +22,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.gnome.shell.extensions.lockkeys.gschema.xml
 
 GH_ACCOUNT=	kazysmaster
-GH_PROJECT=	gnome-shell-extension-lockkeys
 GH_TAGNAME=	76ac557
 
 PKGMESSAGE=	../gnome-shell-extra-extensions/pkg-message.slaves
diff --git a/deskutils/gnome-shell-extension-openweather/Makefile b/deskutils/gnome-shell-extension-openweather/Makefile
index ec8975811b5..46029a81ff3 100644
--- a/deskutils/gnome-shell-extension-openweather/Makefile
+++ b/deskutils/gnome-shell-extension-openweather/Makefile
@@ -24,7 +24,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.gnome.shell.extensions.openweather.gschema.xml
 
 GH_ACCOUNT=	jenslody
-GH_PROJECT=	gnome-shell-extension-openweather
 GH_TAGNAME=	0162cf7
 
 PKGMESSAGE=	../gnome-shell-extra-extensions/pkg-message.slaves
diff --git a/deskutils/gnome-shell-extension-panel-osd/Makefile b/deskutils/gnome-shell-extension-panel-osd/Makefile
index 4796ea9ed31..22999130f2e 100644
--- a/deskutils/gnome-shell-extension-panel-osd/Makefile
+++ b/deskutils/gnome-shell-extension-panel-osd/Makefile
@@ -23,7 +23,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.gnome.shell.extensions.panel-osd.gschema.xml
 
 GH_ACCOUNT=	jenslody
-GH_PROJECT=	gnome-shell-extension-panel-osd
 GH_TAGNAME=	f388fe7
 
 PKGMESSAGE=	../gnome-shell-extra-extensions/pkg-message.slaves
diff --git a/deskutils/gnome-shell-extension-weather/Makefile b/deskutils/gnome-shell-extension-weather/Makefile
index 0881b11cda9..7761ecac22a 100644
--- a/deskutils/gnome-shell-extension-weather/Makefile
+++ b/deskutils/gnome-shell-extension-weather/Makefile
@@ -20,7 +20,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 GH_ACCOUNT=	Neroth
-GH_PROJECT=	gnome-shell-extension-weather
 GH_TAGNAME=	746debe
 
 PKGMESSAGE=	../gnome-shell-extra-extensions/pkg-message.slaves
diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index c2825b8a831..2cc3ad1343e 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 fc2f0917b99..ca24cb4ad08 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 dc69ffd1356..7e41f724ce4 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 6df1cffc51a..c5de146ce6a 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 dd67ef627f3..136627f645d 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 24f88549bbe..a739008137b 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 5da08e4e7cc..a8c88141036 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 2ed3d8fff2f..93da4381b51 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 bc33229bcf6..dfd009e3910 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 55d9fbafed4..0e3adc0f8ee 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 c003ce741d2..ee724bb3e47 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 a69776f80bb..8b41c997e59 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 19fefe16bce..0f7b6dd9ef5 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 3ae435c3719..0c2d3da00ea 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 867f2174c63..757cae45c06 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 b96749b8945..1e451fbb582 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 4f0d7aaa1ea..39f7f5098d2 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile