Index: gromacs/Portfile
===================================================================
--- gromacs/Portfile	(revision 62253)
+++ gromacs/Portfile	(working copy)
@@ -%ld,%ld +%ld,%ld @@
 # Important: keep in sync with the 'gromacs-double' port!
 
 PortSystem  1.0
+PortGroup   muniversal 1.0
 name		gromacs
-version		4.0.5
-revision	3
+version		4.0.7
+revision	1
 categories	science math
 maintainers	adfernandes openmaintainer
 description	The World's fastest Molecular Dynamics package
@@ -%ld,%ld +%ld,%ld @@
 master_sites	ftp://ftp.gromacs.org/pub/gromacs \
                 http://cluster.earlham.edu/detail/home/charliep/packages
 
-checksums       sha1 9969aae6f77e2216add22a7b29805c4de8df649f
+checksums       sha1 8519bef2fa989fb487d54612b0a2d0228f228b30
 
-patchfiles      ffG53aX_rtp.diff
-                # Fixes a typo in the .rtp file for ffG53a6 and ffG53a5 in Gromacs versions up to (and including) version 4.0.5.
-                # See http://www.bevanlab.biochem.vt.edu/Pages/Personal/justin/gmx-tutorials/membrane_protein/01_pdb2gmx.html
-
 depends_lib 	port:fftw-3-single port:libxml2 port:openmotif
 
 configure.args  --bindir=${prefix}/lib/${name}/bin --enable-shared --with-x
 
-platform darwin 10 {
-    configure.args-append   --enable-apple-64bit
-}
-
 variant no_x11 {
     depends_lib-delete      port:openmotif
     configure.args-delete   --with-x
Index: gromacs-double/Portfile
===================================================================
--- gromacs-double/Portfile	(revision 62252)
+++ gromacs-double/Portfile	(working copy)
@@ -%ld,%ld +%ld,%ld @@
 # Important: keep in sync with the 'gromacs' port!
 
 PortSystem  1.0
+PortGroup   muniversal 1.0
 name		gromacs-double
-version		4.0.5
-revision	3
+version		4.0.7
+revision	1
 categories	science math
 maintainers	adfernandes openmaintainer
 description	The World's fastest Molecular Dynamics package (double-precision)
@@ -%ld,%ld +%ld,%ld @@
 master_sites	ftp://ftp.gromacs.org/pub/gromacs \
                 http://cluster.earlham.edu/detail/home/charliep/packages
 
-checksums       sha1 9969aae6f77e2216add22a7b29805c4de8df649f
+checksums       sha1 8519bef2fa989fb487d54612b0a2d0228f228b30
 
-# Currently, no patchfiles are needed since the only patch is in
-# a data file for the dependent gromacs (single-precision) port.
-
 depends_lib 	port:fftw-3 port:libxml2 port:openmotif port:gromacs
 
 configure.args  --bindir=${prefix}/lib/${name}/bin --enable-shared --with-x --enable-double
 
-platform darwin 10 {
-    configure.args-append   --enable-apple-64bit
-}
-
 variant no_x11 {
     depends_lib-delete      port:openmotif
     configure.args-delete   --with-x