aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/brotli/Makefile2
-rw-r--r--archivers/liblz4/Makefile1
-rw-r--r--astro/wmjupiter/Makefile1
-rw-r--r--astro/wmsolar/Makefile1
-rw-r--r--audio/praat/Makefile4
-rw-r--r--audio/praat/distinfo4
-rw-r--r--audio/xmms2/Makefile2
-rw-r--r--benchmarks/smhasher/Makefile3
-rw-r--r--biology/fastx-toolkit/Makefile1
-rw-r--r--biology/lamarc/Makefile2
-rw-r--r--biology/libgtextutils/Makefile1
-rw-r--r--cad/ghdl/Makefile1
-rw-r--r--comms/cqrlog/Makefile2
-rw-r--r--comms/dump1090_mr/Makefile3
-rw-r--r--comms/geoid/Makefile2
-rw-r--r--databases/gomdb/Makefile1
-rw-r--r--databases/jlog/Makefile1
-rw-r--r--databases/levigo/Makefile1
-rw-r--r--databases/mysql-workbench52/Makefile2
-rw-r--r--databases/py-MySQLdb/Makefile2
-rw-r--r--databases/sqlbuddy/Makefile1
-rw-r--r--databases/sqlcipher/Makefile2
-rw-r--r--deskutils/gnome-shell-extension-lockkeys/Makefile1
-rw-r--r--deskutils/gnome-shell-extension-openweather/Makefile1
-rw-r--r--deskutils/gnome-shell-extension-panel-osd/Makefile1
-rw-r--r--deskutils/gnome-shell-extension-weather/Makefile1
-rw-r--r--devel/aegis/Makefile2
-rw-r--r--devel/caf/Makefile1
-rw-r--r--devel/cc65/Makefile2
-rw-r--r--devel/dmake/Makefile1
-rw-r--r--devel/erlang-gpb/Makefile1
-rw-r--r--devel/fossil/Makefile2
-rw-r--r--devel/godep/Makefile1
-rw-r--r--devel/ivykis/Makefile1
-rw-r--r--devel/liblas/Makefile1
-rw-r--r--devel/libnaji/Makefile3
-rw-r--r--devel/msgpuck/Makefile1
-rw-r--r--devel/oniguruma5/Makefile2
-rw-r--r--devel/rapidjson/Makefile1
-rw-r--r--devel/rlwrap/Makefile1
-rw-r--r--devel/unibilium/Makefile2
-rw-r--r--devel/valgrind-devel/Makefile2
-rw-r--r--devel/valgrind/Makefile2
-rw-r--r--emulators/dynamips-community/Makefile1
-rw-r--r--games/2048/Makefile2
-rw-r--r--games/3omns/Makefile1
-rw-r--r--games/corsix-th/Makefile2
-rw-r--r--games/craft/Makefile2
-rw-r--r--games/jaggedalliance2/Makefile3
-rw-r--r--games/openclonk/Makefile2
-rw-r--r--games/solarus-quest-editor/Makefile1
-rw-r--r--games/teg/Makefile1
-rw-r--r--games/traingame/Makefile1
-rw-r--r--games/trigger-rally/Makefile2
-rw-r--r--games/ultimatestunts/Makefile2
-rw-r--r--german/wordpress/Makefile2
-rw-r--r--lang/libobjc2/Makefile8
-rw-r--r--mail/roundcube-automatic_addressbook/Makefile1
-rw-r--r--mail/roundcube-html5_notifier/Makefile1
-rw-r--r--math/pdal/Makefile1
-rw-r--r--multimedia/libde265/Makefile1
-rw-r--r--multimedia/vdr-plugin-vnsiserver/Makefile1
-rw-r--r--net-im/tox/Makefile1
-rw-r--r--net-p2p/namecoin/Makefile2
-rw-r--r--net/beanstalkd/Makefile1
-rw-r--r--net/dpinger/Makefile3
-rw-r--r--net/dpinger/distinfo4
-rw-r--r--net/freerdp/Makefile1
-rw-r--r--net/go-geoip/Makefile1
-rw-r--r--net/sflowtool/Makefile1
-rw-r--r--net/torsocks/Makefile1
-rw-r--r--ports-mgmt/py-pytoport/Makefile1
-rw-r--r--science/2d-rewriter/Makefile1
-rw-r--r--security/pulledpork/Makefile1
-rw-r--r--security/py-crits/Makefile1
-rw-r--r--security/py-gpsoauth/Makefile1
-rw-r--r--security/s2n/Makefile1
-rw-r--r--sysutils/bareos-server/Makefile2
-rw-r--r--sysutils/cronolog/Makefile1
-rw-r--r--textproc/smu/Makefile1
-rw-r--r--www/kannel-sqlbox/Makefile1
-rw-r--r--www/tidy-html5/Makefile1
-rw-r--r--x11-clocks/wmbinclock/Makefile1
-rw-r--r--x11-fonts/junction/Makefile1
84 files changed, 36 insertions, 98 deletions
diff --git a/archivers/brotli/Makefile b/archivers/brotli/Makefile
index c741606f2f0c..b9d5ad5ab4af 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 29dcc2854649..9ea2d2e50a5e 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 e59aecc15691..5f18ff350eb0 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 0c24f564892b..4460d1c563be 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 c1704038134e..bbd8a9056d25 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 641a5aeb2495..f352b1782eaa 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 79e570cb843a..2604c855646c 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 41f318fa3024..4661f9c7f92d 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 26e5da66c434..67a7c846d851 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 75d9ddc65620..2e5e3b0b3c1c 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 1293a0186505..1cc106ef7e7d 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 8ad8df7b4b8a..4e80573b6507 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 f1e4d37cf5d3..42064cf09edc 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 6bc0b21e409e..62595ecc8451 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 364f38b623a7..d73ced4749a4 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 b58a8a6a373c..11080f1fc660 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 1e8037af2b69..7e1fba8ee107 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 b144a716d01d..70cb01374a48 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 4b7ee2a5ec82..81577b0035bf 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 ffe2f47b4059..ab707041c966 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 17850d917162..b8dfd0eb3356 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 c591b1fc8891..0924742cef8f 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 0071eaf748a5..38b39c321f82 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 ec8975811b5d..46029a81ff38 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 4796ea9ed31c..22999130f2eb 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 0881b11cda9d..7761ecac22a0 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 c2825b8a8316..2cc3ad1343e9 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 fc2f0917b99e..ca24cb4ad088 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 dc69ffd13567..7e41f724ce40 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 6df1cffc51af..c5de146ce6ab 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 dd67ef627f3e..136627f645d2 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 24f88549bbed..a739008137b1 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 5da08e4e7cc9..a8c881410364 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 2ed3d8fff2fb..93da4381b51a 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 bc33229bcf64..dfd009e39104 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 55d9fbafed47..0e3adc0f8eed 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 c003ce741d2a..ee724bb3e47a 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 a69776f80bb9..8b41c997e59f 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 19fefe16bce2..0f7b6dd9ef58 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 3ae435c37194..0c2d3da00ea5 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 867f2174c632..757cae45c060 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 b96749b89451..1e451fbb5822 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 4f0d7aaa1eac..39f7f5098d26 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
diff --git a/emulators/dynamips-community/Makefile b/emulators/dynamips-community/Makefile
index 76903f4385b0..5e75b0c3c027 100644
--- a/emulators/dynamips-community/Makefile
+++ b/emulators/dynamips-community/Makefile
@@ -25,7 +25,6 @@ USE_GITHUB= yes
MAKE_JOBS_UNSAFE= yes
GH_ACCOUNT= GNS3
-GH_PROJECT= dynamips
MAKE_ENV= DYNAMIPS_CODE=${DYNAMIPS_CODE} \
DYNAMIPS_ARCH=${DYNAMIPS_ARCH}
diff --git a/games/2048/Makefile b/games/2048/Makefile
index 6b4ac66a077c..baa9f61d552e 100644
--- a/games/2048/Makefile
+++ b/games/2048/Makefile
@@ -3,9 +3,9 @@
PORTNAME= 2048
PORTVERSION= 0.9
+DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= games
-DISTVERSIONPREFIX= v
MAINTAINER= swills@FreeBSD.org
COMMENT= Command line version of 2048
diff --git a/games/3omns/Makefile b/games/3omns/Makefile
index 4238bb5f685a..3a7ae19e264c 100644
--- a/games/3omns/Makefile
+++ b/games/3omns/Makefile
@@ -24,7 +24,6 @@ LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
USE_GITHUB= yes
GH_ACCOUNT= chazomaticus
-GH_PROJECT= 3omns
GH_TAGNAME= 21292f0
USES= autoreconf compiler:c++11-lang gmake pkgconfig lua:52
diff --git a/games/corsix-th/Makefile b/games/corsix-th/Makefile
index fd4b40a86df1..bc0a2b67e58a 100644
--- a/games/corsix-th/Makefile
+++ b/games/corsix-th/Makefile
@@ -3,8 +3,8 @@
PORTNAME= corsixth
PORTVERSION= 0.50
-PORTREVISION= 1
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= madpilot@FreeBSD.org
diff --git a/games/craft/Makefile b/games/craft/Makefile
index 0244494b6c77..9ce40a523aec 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -3,9 +3,9 @@
PORTNAME= craft
PORTVERSION= 1.0
-PORTREVISION= 1
DISTVERSIONPREFIX= v
DISTVERSIONSUFFIX= fbsd
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= danilo@FreeBSD.org
diff --git a/games/jaggedalliance2/Makefile b/games/jaggedalliance2/Makefile
index e19498269af7..f82e600fff82 100644
--- a/games/jaggedalliance2/Makefile
+++ b/games/jaggedalliance2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ja2
PORTVERSION= 0.12.1
+DISTVERSIONSUFFIX= -source
PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://deponie.yamagi.org/freebsd/distfiles/ \
@@ -13,8 +14,6 @@ COMMENT= Port of "Jagged Alliance 2" using SDL
BROKEN= unfetchable
-DISTVERSIONSUFFIX= -source
-
# Ignore this if you feel adventurous
ONLY_FOR_ARCHS= amd64 arm i386 pc98
ONLY_FOR_ARCHS_REASON= Needs a little endian environment
diff --git a/games/openclonk/Makefile b/games/openclonk/Makefile
index ba0f3646627f..d967db1cf4a8 100644
--- a/games/openclonk/Makefile
+++ b/games/openclonk/Makefile
@@ -3,8 +3,8 @@
PORTNAME= openclonk
PORTVERSION= 6.1
-PORTREVISION= 1
DISTVERSIONSUFFIX= -src
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.openclonk.org/builds/release/${DISTVERSION}/
diff --git a/games/solarus-quest-editor/Makefile b/games/solarus-quest-editor/Makefile
index d996b49d1cc7..9b55e084f868 100644
--- a/games/solarus-quest-editor/Makefile
+++ b/games/solarus-quest-editor/Makefile
@@ -21,7 +21,6 @@ LIB_DEPENDS= libphysfs.so:${PORTSDIR}/devel/physfs \
USE_GITHUB= yes
GH_ACCOUNT= christopho
-GH_PROJECT= ${PORTNAME}
CMAKE_ARGS+= -DSOLARUS_USE_LUAJIT=OFF
USE_SDL= sdl2 ttf2 image2
diff --git a/games/teg/Makefile b/games/teg/Makefile
index d3afbbec96ca..1124bbc1f2b4 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
GH_ACCOUNT= wfx
-GH_PROJECT= teg
USES= gettext-tools gmake iconv libtool pathfix pkgconfig
USE_GNOME= gnomeprefix intlhack libgnomeui
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/games/traingame/Makefile b/games/traingame/Makefile
index 9db32d6b2c43..9f59694426e7 100644
--- a/games/traingame/Makefile
+++ b/games/traingame/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
USE_GITHUB= yes
GH_ACCOUNT= nickg
-GH_PROJECT= traingame
GH_TAGNAME= cb6513e
USES= cmake compiler:c++11-lib dos2unix pkgconfig
diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile
index 50e79d87fbe8..7b6e977e5eca 100644
--- a/games/trigger-rally/Makefile
+++ b/games/trigger-rally/Makefile
@@ -3,9 +3,9 @@
PORTNAME= trigger-rally
PORTVERSION= 0.6.1
+DISTVERSIONSUFFIX= -src
CATEGORIES= games
MASTER_SITES= SF/trigger-rally/trigger-${PORTVERSION}
-DISTVERSIONSUFFIX= -src
MAINTAINER= makc@FreeBSD.org
COMMENT= Rally car racing game
diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile
index 053f6d2ea842..8813cc45208b 100644
--- a/games/ultimatestunts/Makefile
+++ b/games/ultimatestunts/Makefile
@@ -3,9 +3,9 @@
PORTNAME= ultimatestunts
PORTVERSION= 0.7.7.1
-PORTREVISION= 3
DISTVERSIONPREFIX= srcdata-
DISTVERSION= ${PORTVERSION:S/.//g}
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/sourcecode \
SF/nemysisfreebsdp/${CATEGORIES}/:icons
diff --git a/german/wordpress/Makefile b/german/wordpress/Makefile
index 5819567e4532..5fe49e15a3d4 100644
--- a/german/wordpress/Makefile
+++ b/german/wordpress/Makefile
@@ -3,8 +3,8 @@
PORTNAME= wordpress
PORTVERSION= 4.4
-PORTREVISION= 1
DISTVERSIONSUFFIX= -de_DE
+PORTREVISION= 1
CATEGORIES= german www
MASTER_SITES= http://de.wordpress.org/
diff --git a/lang/libobjc2/Makefile b/lang/libobjc2/Makefile
index 253983edd480..5d92c792d9c6 100644
--- a/lang/libobjc2/Makefile
+++ b/lang/libobjc2/Makefile
@@ -4,10 +4,6 @@
PORTNAME= libobjc2
PORTVERSION= 1.8.1
CATEGORIES= lang devel gnustep
-USE_GITHUB= yes
-GH_ACCOUNT= gnustep
-GH_PROJECT= libobjc2
-GH_TAGNAME= 5a21dd1
MAINTAINER= theraven@FreeBSD.org
COMMENT= Replacement Objective-C runtime supporting modern Objective-C features
@@ -18,6 +14,10 @@ USES= cmake objc:compiler
BROKEN_powerpc= Does not compile on powerpc: Unsupported relocation type 10
BROKEN_sparc64= Does not compile on sparc64: Cannot configure clang properly
+USE_GITHUB= yes
+GH_ACCOUNT= gnustep
+GH_TAGNAME= 5a21dd1
+
.include <bsd.port.options.mk>
SHLIB_MAJOR= 4
diff --git a/mail/roundcube-automatic_addressbook/Makefile b/mail/roundcube-automatic_addressbook/Makefile
index b347e62fe92f..bc4142b74349 100644
--- a/mail/roundcube-automatic_addressbook/Makefile
+++ b/mail/roundcube-automatic_addressbook/Makefile
@@ -17,7 +17,6 @@ NO_ARCH= yes
USE_GITHUB= yes
GH_ACCOUNT= sblaisot
-GH_PROJECT= automatic_addressbook
RCDIR= ${PREFIX}/www/roundcube
WWWDIR= ${RCDIR}/plugins/automatic_addressbook
diff --git a/mail/roundcube-html5_notifier/Makefile b/mail/roundcube-html5_notifier/Makefile
index eecbf038cff1..7a78e2612f7e 100644
--- a/mail/roundcube-html5_notifier/Makefile
+++ b/mail/roundcube-html5_notifier/Makefile
@@ -17,7 +17,6 @@ BUILD_DEPENDS= roundcube>=1.0:${PORTSDIR}/mail/roundcube
USE_GITHUB= yes
GH_ACCOUNT= kitist
-GH_PROJECT= html5_notifier
NO_BUILD= yes
diff --git a/math/pdal/Makefile b/math/pdal/Makefile
index a63f0f901306..13096ce3f3b2 100644
--- a/math/pdal/Makefile
+++ b/math/pdal/Makefile
@@ -16,7 +16,6 @@ compiler_ARGS= c++11-lang
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME:tu}
-GH_PROJECT= ${GH_ACCOUNT}
OPTIONS_DEFINE= GDAL GEOTIFF LIBXML2 EMBED_BOOST
OPTIONS_DEFAULT= GDAL GEOTIFF LIBXML2
diff --git a/multimedia/libde265/Makefile b/multimedia/libde265/Makefile
index 9df4a06ee727..e819b285dcb3 100644
--- a/multimedia/libde265/Makefile
+++ b/multimedia/libde265/Makefile
@@ -11,7 +11,6 @@ COMMENT= Open source h.265 video codec
USE_GITHUB= yes
GH_ACCOUNT= strukturag
-GH_PROJECT= libde265
USES= autoreconf compiler:c++11-lib libtool pathfix pkgconfig
GNU_CONFIGURE= yes
diff --git a/multimedia/vdr-plugin-vnsiserver/Makefile b/multimedia/vdr-plugin-vnsiserver/Makefile
index 420f27736db3..5c77753dec25 100644
--- a/multimedia/vdr-plugin-vnsiserver/Makefile
+++ b/multimedia/vdr-plugin-vnsiserver/Makefile
@@ -10,7 +10,6 @@ COMMENT= Video Disk Recorder - VNSI server plugin
USE_GITHUB= yes
GH_ACCOUNT= FernetMenta
-GH_PROJECT= ${PORTNAME}
GH_TAGNAME= 36e2b61
USES= pkgconfig
diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index aceaf96aee65..0065d9d40358 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx \
USE_GITHUB= yes
GH_ACCOUNT= irungentoo
-GH_PROJECT= ${PORTNAME}
GH_TAGNAME= 22634a4
GNU_CONFIGURE= yes
diff --git a/net-p2p/namecoin/Makefile b/net-p2p/namecoin/Makefile
index dd494f990b76..f0d2a519c3fe 100644
--- a/net-p2p/namecoin/Makefile
+++ b/net-p2p/namecoin/Makefile
@@ -22,8 +22,6 @@ UPNP_DESC= Build with UPNP support
QRCODES_DESC= Build with QR code display
USE_GITHUB= yes
-GH_ACCOUNT= namecoin
-GH_PROJECT= namecoin
USES= gmake compiler:c++11-lib
MAKE_JOBS_UNSAFE=yes
diff --git a/net/beanstalkd/Makefile b/net/beanstalkd/Makefile
index d8eca26f2626..c9f2ff5f33c8 100644
--- a/net/beanstalkd/Makefile
+++ b/net/beanstalkd/Makefile
@@ -15,7 +15,6 @@ USE_GITHUB= yes
USE_RC_SUBR= beanstalkd
GH_ACCOUNT= kr
-GH_PROJECT= beanstalkd
MAKE_ARGS+= CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/net/dpinger/Makefile b/net/dpinger/Makefile
index 7a4c65d0ec4d..21c8c746cf47 100644
--- a/net/dpinger/Makefile
+++ b/net/dpinger/Makefile
@@ -2,6 +2,7 @@
PORTNAME= dpinger
PORTVERSION= 1.2
+DISTVERSIONPREFIX= v
CATEGORIES= net
MAINTAINER= garga@FreeBSD.org
@@ -12,8 +13,6 @@ LICENSE= BSD2CLAUSE
USES= uidfix
USE_GITHUB= yes
GH_ACCOUNT= dennypage
-GH_PROJECT= dpinger
-GH_TAGNAME= v${PORTVERSION}
PLIST_FILES= bin/dpinger
diff --git a/net/dpinger/distinfo b/net/dpinger/distinfo
index a3d39ecfcabc..b3a1749c4a9c 100644
--- a/net/dpinger/distinfo
+++ b/net/dpinger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dennypage-dpinger-1.2-v1.2_GH0.tar.gz) = a904dcb5993ae9f25388634d90c21bdea87b45b9e1b271c0a4cbc7eb0dd6a314
-SIZE (dennypage-dpinger-1.2-v1.2_GH0.tar.gz) = 9809
+SHA256 (dennypage-dpinger-v1.2_GH0.tar.gz) = a904dcb5993ae9f25388634d90c21bdea87b45b9e1b271c0a4cbc7eb0dd6a314
+SIZE (dennypage-dpinger-v1.2_GH0.tar.gz) = 9809
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index d7c03a1c4711..758d3b6e3a60 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -17,7 +17,6 @@ USE_LDCONFIG= yes
USES= alias cmake:outsource cpe execinfo pkgconfig compiler:c++11-lib
USE_GITHUB= yes
GH_ACCOUNT= FreeRDP
-GH_PROJECT= ${GH_ACCOUNT}
GH_TAGNAME= f5ff6e1
CPE_VENDOR= freerdp_project
diff --git a/net/go-geoip/Makefile b/net/go-geoip/Makefile
index e4d2f54c3cca..686bb4331db2 100644
--- a/net/go-geoip/Makefile
+++ b/net/go-geoip/Makefile
@@ -16,7 +16,6 @@ LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP
USES= compiler
USE_GITHUB= yes
GH_ACCOUNT= abh
-GH_PROJECT= ${PORTNAME}
GH_TAGNAME= da13074
GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT}
diff --git a/net/sflowtool/Makefile b/net/sflowtool/Makefile
index fe0dac407987..408f63b114f1 100644
--- a/net/sflowtool/Makefile
+++ b/net/sflowtool/Makefile
@@ -15,7 +15,6 @@ USE_RC_SUBR= ${PORTNAME}
USE_GITHUB= yes
GH_ACCOUNT= sflow
-GH_PROJECT= ${PORTNAME}
GH_TAGNAME= 08a16d3
PLIST_FILES= bin/sflowtool
diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile
index 4ae394ff4a4f..8cd9b0d6f70b 100644
--- a/net/torsocks/Makefile
+++ b/net/torsocks/Makefile
@@ -13,7 +13,6 @@ LICENSE= GPLv2
USE_GITHUB= yes
GH_ACCOUNT= dgoulet
-GH_PROJECT= torsocks
GNU_CONFIGURE= yes
USES= alias autoreconf gmake libtool
diff --git a/ports-mgmt/py-pytoport/Makefile b/ports-mgmt/py-pytoport/Makefile
index 3ecd35845425..41c6858d6f82 100644
--- a/ports-mgmt/py-pytoport/Makefile
+++ b/ports-mgmt/py-pytoport/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-licensee>0:${PORTSDIR}/devel/rubygem-licensee
USE_GITHUB= yes
GH_ACCOUNT= freebsd
-GH_PROJECT= pytoport
USES= python:3.2+
USE_PYTHON= distutils autoplist
diff --git a/science/2d-rewriter/Makefile b/science/2d-rewriter/Makefile
index cfe92ee6f6c8..635cda38ac98 100644
--- a/science/2d-rewriter/Makefile
+++ b/science/2d-rewriter/Makefile
@@ -14,7 +14,6 @@ USES= imake
USE_XORG= x11 xext
USE_GITHUB= yes
GH_ACCOUNT= iserikov
-GH_PROJECT= 2d-rewriter
OPTIONS_DEFINE= EXAMPLES
diff --git a/security/pulledpork/Makefile b/security/pulledpork/Makefile
index d277162663a3..778f47ed1485 100644
--- a/security/pulledpork/Makefile
+++ b/security/pulledpork/Makefile
@@ -26,7 +26,6 @@ SUB_FILES= pkg-message
USE_GITHUB= yes
GH_ACCOUNT= shirkdog
-GH_PROJECT= ${PORTNAME}
GH_TAGNAME= 8b9441a
OPTIONS_DEFINE= DOCS
diff --git a/security/py-crits/Makefile b/security/py-crits/Makefile
index 675fce56b55c..ef98e2b9dcd2 100644
--- a/security/py-crits/Makefile
+++ b/security/py-crits/Makefile
@@ -15,7 +15,6 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
-GH_PROJECT= crits
USES= python
USE_PYTHON= autoplist
diff --git a/security/py-gpsoauth/Makefile b/security/py-gpsoauth/Makefile
index 583b6d79dbe2..e277da423693 100644
--- a/security/py-gpsoauth/Makefile
+++ b/security/py-gpsoauth/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:${PORTSDIR}/security/py-pycr
USE_GITHUB= yes
GH_ACCOUNT= simon-weber
-GH_PROJECT= gpsoauth
GH_TAGNAME= ea8246b
USES= python
diff --git a/security/s2n/Makefile b/security/s2n/Makefile
index 545513a21f16..771ea8b7d824 100644
--- a/security/s2n/Makefile
+++ b/security/s2n/Makefile
@@ -12,7 +12,6 @@ LICENSE= APACHE20
USE_GITHUB= yes
GH_ACCOUNT= awslabs
-GH_PROJECT= s2n
GH_TAGNAME= 674df33
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index c8bded2fd9d5..cfc22f97ff74 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -9,8 +9,6 @@ PKGNAMEPREFIX?= #
PKGNAMESUFFIX?= -server
USE_GITHUB= yes
-GH_ACCOUNT= bareos
-GH_PROJECT= bareos
GH_TAGNAME= bb1529f88585da31a0053f06727c74f2a7cb0dc1
MAINTAINER= acm@FreeBSD.org
diff --git a/sysutils/cronolog/Makefile b/sysutils/cronolog/Makefile
index 8fe46c6735b9..b738db40972f 100644
--- a/sysutils/cronolog/Makefile
+++ b/sysutils/cronolog/Makefile
@@ -18,7 +18,6 @@ GNU_CONFIGURE= yes
USE_GITHUB= yes
GH_ACCOUNT= fordmason
-GH_PROJECT= cronolog
GH_TAGNAME= 8ea64c0
OPTIONS_DEFINE= SETUID_PATCH
diff --git a/textproc/smu/Makefile b/textproc/smu/Makefile
index e95682ff54bd..9315becc8b8d 100644
--- a/textproc/smu/Makefile
+++ b/textproc/smu/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= Gottox
-GH_PROJECT= smu
PLIST_FILES= bin/smu man/man1/smu.1.gz
diff --git a/www/kannel-sqlbox/Makefile b/www/kannel-sqlbox/Makefile
index a2d2dedec82e..739d79e40b72 100644
--- a/www/kannel-sqlbox/Makefile
+++ b/www/kannel-sqlbox/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/bearerbox:${PORTSDIR}/www/kannel
USE_GITHUB= yes
GH_ACCOUNT= dbaio
-GH_PROJECT= ${PORTNAME}
USES= gmake
USE_GCC= yes
diff --git a/www/tidy-html5/Makefile b/www/tidy-html5/Makefile
index de7d30e2268b..f49bad56249f 100644
--- a/www/tidy-html5/Makefile
+++ b/www/tidy-html5/Makefile
@@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/README/LICENSE.txt
USE_GITHUB= yes
GH_ACCOUNT= htacg
-GH_PROJECT= ${PORTNAME}
GH_TAGNAME= f567088
USES= cmake
diff --git a/x11-clocks/wmbinclock/Makefile b/x11-clocks/wmbinclock/Makefile
index 949024629f21..943a18ade0d0 100644
--- a/x11-clocks/wmbinclock/Makefile
+++ b/x11-clocks/wmbinclock/Makefile
@@ -13,7 +13,6 @@ LICENSE_COMB= dual
USE_GITHUB= yes
GH_ACCOUNT= engerim42
-GH_PROJECT= ${PORTNME}
PLIST_FILES= bin/wmBinClock
USES= gmake
diff --git a/x11-fonts/junction/Makefile b/x11-fonts/junction/Makefile
index d6163601eba2..6bad9c8f156e 100644
--- a/x11-fonts/junction/Makefile
+++ b/x11-fonts/junction/Makefile
@@ -14,7 +14,6 @@ USES= fonts
USE_GITHUB= yes
GH_ACCOUNT= theleagueof
-GH_PROJECT= junction
GH_TAGNAME= fb73260
NO_BUILD= yes