Index: /trunk/ports/python/py-hesiod/Portfile
===================================================================
--- /trunk/ports/python/py-hesiod/Portfile (revision 213)
+++ /trunk/ports/python/py-hesiod/Portfile (revision 217)
@@ -22,5 +22,5 @@
 
 if {${name} ne ${subport}} {
-    depends_lib-append      port:libhesiod \
+    depends_lib-append      port:hesiod \
                             port:py${python.version}-cython \
                             port:py${python.version}-setuptools
Index: /trunk/ports/net/macathena-moira/Portfile
===================================================================
--- /trunk/ports/net/macathena-moira/Portfile (revision 211)
+++ /trunk/ports/net/macathena-moira/Portfile (revision 217)
@@ -43,5 +43,5 @@
 depends_build		port:e2fsprogs
 
-depends_lib		port:libhesiod \
+depends_lib		port:hesiod \
 				port:ncurses
 
Index: /trunk/ports/net/macathena-getcluster/Portfile
===================================================================
--- /trunk/ports/net/macathena-getcluster/Portfile (revision 203)
+++ /trunk/ports/net/macathena-getcluster/Portfile (revision 217)
@@ -24,4 +24,4 @@
 }
 
-depends_lib		port:libhesiod \
+depends_lib		port:hesiod \
 				port:macathena-base
Index: /trunk/ports/net/libhesiod/Portfile
===================================================================
--- /trunk/ports/net/libhesiod/Portfile (revision 14)
+++ /trunk/ports/net/libhesiod/Portfile (revision 217)
@@ -1,22 +1,9 @@
 # $Id$
-PortSystem		1.0
+PortSystem          1.0
+PortGroup           obsolete 1.0
 
-name			libhesiod
-version			3.1.0
-distname		hesiod-${version}
-categories		net
-maintainers		mit.edu:sipb-macathena
-description		Hesiod is the Project Athena service name resolution protocol
-platforms		darwin
-master_sites	ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/
-patchfiles		patch-Makefile.in \
-				patch-hesiod.c \
-				patch-config.sub \
-				patch-config.guess
-checksums		md5 89c785d350e75d6628754659ee4583e8 \
-				sha1 bcffa55ee3c04ddb49d90f231191e5bc31762c7a \
-				rmd160 d5c38ffabb2491a80a05a4805bbffd333b9d4b14
-
-configure.args	LIBS=-lresolv
-
-destroot.violate_mtree	yes
+name                libhesiod
+replaced_by         hesiod
+version             3.1.0
+revision            1
+categories          net
Index: /trunk/ports/net/hesiod/Portfile
===================================================================
--- /trunk/ports/net/hesiod/Portfile (revision 14)
+++ /trunk/ports/net/hesiod/Portfile (revision 217)
@@ -1,18 +1,18 @@
 # $Id$
-PortSystem		1.0
+PortSystem          1.0
+PortGroup           github 1.0
 
-name			hesiod
-version			3.1.0
-distname		hesinfo-${version}
-categories		net
-maintainers		mit.edu:sipb-macathena
-description		Hesiod is the Project Athena service name resolution protocol
-platforms		darwin
-master_sites	ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/
-checksums		md5 376b3af2bb3f59a972c218312527eadf \
-				sha1 30a92f80f0e8754a5dfc377c71b50f517b168d3a \
-				rmd160 b7ac55b67992748cbc7b9cd64b0c6b4b4e4cb6bf
+github.setup        achernya hesiod 3.2.1 hesiod-
+categories          net
+maintainers         mit.edu:sipb-macathena
+description         Hesiod is the Project Athena service name resolution protocol
+platforms           darwin
+checksums           md5     af10415fc09bace6f2f44ffed5f8d2ba \
+                    sha1    db6ebbddb020f0ed6cf5ce68b0b851e777cc70fe \
+                    rmd160  d389f71825340e994840d4ccee7a0dbd5d97a470 \
+                    sha256  4722f4f5d57f00fff168c11a89259418ce47fbfb7ed34c8e09e91b48d27dd8d5 \
+                    size    46889
 
-depends_lib		port:libhesiod
+use_autoreconf      yes
 
-destroot.violate_mtree	yes
+#destroot.violate_mtree	yes