Index: head/devel/gperf31/Makefile
===================================================================
--- head/devel/gperf31/Makefile	(revision 513973)
+++ head/devel/gperf31/Makefile	(revision 513974)
@@ -1,23 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	gperf
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	31
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Generates perfect hash functions for sets of keywords
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	ace+tao-[0-9]* gperf-*
+CONFLICTS=	ace+tao-[0-9]*
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
 INFO=		gperf
 TEST_TARGET=	check
+
+post-install:
+	${MV} ${STAGEDIR}/${PREFIX}/bin/gperf \
+		${STAGEDIR}/${PREFIX}/bin/gperf31
+	${MV} ${STAGEDIR}/${PREFIX}/man/man1/gperf.1 \
+		${STAGEDIR}/${PREFIX}/man/man1/gperf31.1
+	${MV} ${STAGEDIR}/${DOCSDIR}/gperf.html \
+		${STAGEDIR}/${DOCSDIR}/gperf31.html
 
 .include <bsd.port.mk>
Index: head/devel/gperf31/pkg-plist
===================================================================
--- head/devel/gperf31/pkg-plist	(revision 513973)
+++ head/devel/gperf31/pkg-plist	(revision 513974)
@@ -1,3 +1,3 @@
-bin/gperf
-man/man1/gperf.1.gz
-%%DOCSDIR%%/gperf.html
+bin/gperf31
+man/man1/gperf31.1.gz
+%%DOCSDIR%%/gperf31.html