Index: head/science/gabedit/Makefile
===================================================================
--- head/science/gabedit/Makefile	(revision 549399)
+++ head/science/gabedit/Makefile	(revision 549400)
@@ -1,58 +1,57 @@
 # $FreeBSD$
 
 PORTNAME=	gabedit
-DISTVERSION=	2.5.1
-PORTREVISION=	4
+DISTVERSION=	2.5.1-300720 # the last number is "snapshot"
 CATEGORIES=	science
-#MASTER_SITES=	http://prdownloads.sourceforge.net/${PORTNAME}/ # old SF-based source
-#DISTNAME=	GabeditSrc${DISTVERSION:S/.//g}
-MASTER_SITES=	https://sites.google.com/site/allouchear/Home/gabedit/download/ # development version now on sites.google.com, browse to the same URL for details
-DISTNAME=	GabeditSrc${DISTVERSION:S/.//g}_061218
+MASTER_SITES=	https://sites.google.com/site/allouchear/Home/gabedit/download/
+DISTNAME=	GabeditSrc${DISTVERSION:C/([0-9])\.([0-9])\.([0-9])-([0-9])/\1\2\3_\4/}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Graphical user interface for several chemistry software packages
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/License
 
 BROKEN_i386=	undefined reference to `__atomic_load'
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 USES=		compiler:c++11-lang gettext-runtime gl gmake gnome pkgconfig \
 		xorg
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 pango pangox-compat
 USE_GL=		gl glu
 USE_XORG=	ice sm x11 xmu xt
 INSTALLS_ICONS=	yes
+
+CFLAGS+=	-fcommon # change the default because GlobalOrb.h has many common definitions
 
 BINARY_ALIAS=	make=gmake
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/applications/${PORTNAME}.desktop
 
 ICON_SIZES=	16 24 32 48
 .for SZ in ${ICON_SIZES}
 PLIST_FILES+=	share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png
 .endfor
 
 OPTIONS_DEFINE=		OPENMP
 OPTIONS_DEFAULT=	OPENMP
 
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/|${PREFIX}/|; s| -O2| ${CFLAGS}|; s|gcc|${CC}|' ${WRKSRC}/CONFIG
 
 post-patch-OPENMP-off:
 	@${REINPLACE_CMD} 's|enable_omp = 1|enable_omp = 0|' ${WRKSRC}/CONFIG
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/utils/Others/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 .for SZ in ${ICON_SIZES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps
 	${INSTALL_DATA} ${WRKSRC}/icons/Gabedit${SZ}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png
 .endfor
 
 .include <bsd.port.mk>
Index: head/science/gabedit/distinfo
===================================================================
--- head/science/gabedit/distinfo	(revision 549399)
+++ head/science/gabedit/distinfo	(revision 549400)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549823448
-SHA256 (GabeditSrc251_061218.tar.gz) = de47ca3070900e771aad4d2e92bb685ef2f46999efeb1d33f6ce7c96f59c30f4
-SIZE (GabeditSrc251_061218.tar.gz) = 4510133
+TIMESTAMP = 1600638987
+SHA256 (GabeditSrc251_300720.tar.gz) = c9893b0e1de9922615ede665ff8de93517528a4b2429c398e971cea32f771dbd
+SIZE (GabeditSrc251_300720.tar.gz) = 7171216
Index: head/science/gabedit/pkg-descr
===================================================================
--- head/science/gabedit/pkg-descr	(revision 549399)
+++ head/science/gabedit/pkg-descr	(revision 549400)
@@ -1,18 +1,18 @@
 Gabedit is a Graphical User Interface for FireFly (PC-Gamess), Gamess-US,
 Gaussian, Molcas, Molpro, MPQC, NWChem, OpenMopac, Orca, PSI4 and Q-Chem
 computational chemistry packages.
 
 Features:
 * Gabedit makes using Computational Chemistry Packages (CCP) simple and
   straightforward .
 * Sketch in molecules using its advanced 3D Structure Builder, or load in
   molecules from standard files.
 * Set up and submit CCP jobs right from the interface, and monitor their
   progress as they run.
 * Examine calculation results graphically via state-of-the-art visualization
   features: display molecular orbitals and other surfaces, view spectra, animate
   normal modes, geometry optimizations and reaction paths.
 * Molecular Dynamics using Amber 99 molecular mechanics or Semi-Empirical
   potentials.
 
-WWW: https://sourceforge.net/projects/gabedit/
+WWW: http://gabedit.sourceforge.net/