diff -urN /usr/ports/devel/happydoc/Makefile devel/happydoc/Makefile
--- /usr/ports/devel/happydoc/Makefile	2012-11-08 05:02:55.000000000 +0900
+++ devel/happydoc/Makefile	2013-03-07 19:08:50.000000000 +0900
@@ -1,31 +1,44 @@
-# ex:ts=8
-# New ports collection makefile for:    happydoc
-# Date created:         Dec 29, 2000
-# Whom:                 Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD: head/devel/happydoc/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 PORTNAME=	happydoc
-PORTVERSION=	3.0.a1
+PORTVERSION=	3.1
 CATEGORIES=	devel python
-MASTER_SITES=	SF/${PORTNAME}/HappyDoc/3.0
+MASTER_SITES=	SF/${PORTNAME}/HappyDoc/${PORTVERSION}
 DISTNAME=	HappyDoc_r${PORTVERSION:S/./_/g}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A tool for extracting documentation from Python source code
+COMMENT=	Tool for extracting documentation from Python source code
+
+LICENSE=	HPND ZPL21
+LICENSE_COMB=	multi
+LICENSE_NAME_HPND=	Historical Permission Notice and Disclaimer
+LICENSE_FILE_HPND=	${WRKSRC}/LICENSE.txt
+LICENSE_GROUPS_HPND=	OSI
+LICENSE_PERMS_HPND=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/HappyDoc3-r${PORTVERSION:S/./_/g}
-NO_BUILD=	yes
-PLIST_FILES=	bin/happydoc
+
+USE_PYTHON=	yes
+
+PLIST=		${WRKDIR}/PLIST
+
+pre-build:
+	@${FIND} ${WRKSRC} \( -name  ".*" -or -name "*.orig" \) -delete
+
+do-build:
+	@${PYTHON_CMD} -m compileall ${WRKSRC}/happydoclib
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}/happydoclib
+
+post-build:
+	@${ECHO_CMD} "bin/happydoc" > ${PLIST}
+	@${FIND} ${WRKSRC}/happydoclib -type f | ${SORT} | ${SED} -e \
+		's|${WRKSRC}|%%PYTHON_SITELIBDIR%%|' >> ${PLIST}
+	@${FIND} ${WRKSRC}/happydoclib -type d | ${SORT} -r | ${SED} -e \
+		's|${WRKSRC}|@dirrm %%PYTHON_SITELIBDIR%%|' >> ${PLIST}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/happydoc ${PREFIX}/bin
-	@${CP} -R ${WRKSRC}/happydoclib ${PYTHON_SITELIBDIR}
-	@${FIND} ${PYTHON_SITELIBDIR}/happydoclib -type f | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${PYTHON_SITELIBDIR}/happydoclib -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} happydoclib ${PYTHON_SITELIBDIR})
 
 .include <bsd.port.mk>
diff -urN /usr/ports/devel/happydoc/distinfo devel/happydoc/distinfo
--- /usr/ports/devel/happydoc/distinfo	2012-11-08 05:02:55.000000000 +0900
+++ devel/happydoc/distinfo	2013-02-23 23:05:58.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (HappyDoc_r3_0_a1.tar.gz) = 311a289906dee8b9f8c327bddab59daa200b0080dd83968ee91fda8bbbf15e39
-SIZE (HappyDoc_r3_0_a1.tar.gz) = 234707
+SHA256 (HappyDoc_r3_1.tar.gz) = ef5f8dee5782a1ebe750aa51b855ce84097f5bb60488826ea5da900098c5aaec
+SIZE (HappyDoc_r3_1.tar.gz) = 732849
diff -urN /usr/ports/devel/happydoc/files/patch-happydoclib__CommandLineApp.py devel/happydoc/files/patch-happydoclib__CommandLineApp.py
--- /usr/ports/devel/happydoc/files/patch-happydoclib__CommandLineApp.py	1970-01-01 09:00:00.000000000 +0900
+++ devel/happydoc/files/patch-happydoclib__CommandLineApp.py	2013-02-24 01:06:53.000000000 +0900
@@ -0,0 +1,28 @@
+--- happydoclib/CommandLineApp.py.orig
++++ happydoclib/CommandLineApp.py
+@@ -102,10 +102,21 @@
+     #
+     # Exception names
+     #
+-    ReservedOptionName = 'Reserved option name'
+-    HelpRequested='Help requested'
+-    InvalidOptionValue='Invalid value for option'
+-    InvalidArgument='Invalid argument to program'
++    class ReservedOptionName(ValueError):
++        'Reserved option name'
++        pass
++
++    class HelpRequested(ValueError):
++        'Help requested'
++        pass
++
++    class InvalidOptionValue(ValueError):
++        'Invalid value for option'
++        pass
++
++    class InvalidArgument(ValueError):
++        'Invalid argument to program'
++        pass
+ 
+     #
+     # Globally useful configuration stuff.