Index: Makefile
===================================================================
--- Makefile	(revision 512054)
+++ Makefile	(working copy)
@@ -1,12 +1,12 @@
 # Created by: Olivier Duchateau
 # $FreeBSD$
 
-PORTNAME=	libutf8proc
+PORTNAME=	libutf8proc1
 PORTVERSION=	1.3.1.3
 DISTVERSIONSUFFIX=	-3-src
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.3$//}${DISTVERSIONSUFFIX}
+DISTNAME=	${PORTNAME:S/1$//}-${PORTVERSION:S/.3$//}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	UTF8 Processing library
@@ -21,9 +21,11 @@
 MAKE_ENV+=	COMPONENT_TYPE="lib-shared"
 PLIST_SUB+=	VERSION=${PORTVERSION:S/.3$//}
 
-CONFLICTS=	utf8proc-[0-9]*
-
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libutf8proc.so*
+	${REINPLACE_CMD} 's|libutf8proc|libutf8proc1|' ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libutf8proc.pc
+	${MV} ${STAGEDIR}${PREFIX}/lib/libutf8proc.so.1.3.1-3 ${STAGEDIR}${PREFIX}/lib/libutf8proc1.so.1.3.1-3
+	${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libutf8proc.pc ${STAGEDIR}/${PREFIX}/libdata/pkgconfig/libutf8proc1.pc
+	${RM} ${STAGEDIR}${PREFIX}/lib/libutf8proc.so ${STAGEDIR}${PREFIX}/lib/libutf8proc.so.1
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libutf8proc1.so*
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 512054)
+++ pkg-plist	(working copy)
@@ -1,5 +1,7 @@
 include/libutf8proc/utf8proc.h
-lib/libutf8proc.so
-lib/libutf8proc.so.1
-lib/libutf8proc.so.%%VERSION%%-3
-libdata/pkgconfig/libutf8proc.pc
+lib/libutf8proc1.so.%%VERSION%%-3
+libdata/pkgconfig/libutf8proc1.pc
+@postexec [ -e %D/usr/local/lib/libutf8proc1.so.%%VERSION%%-3 ] || ln -sf /usr/local/lib/libutf8proc1.so.%%VERSION%%-3 %D/lib/libutf8proc1.so
+@postexec [ -e %D/usr/local/lib/libutf8proc1.so.%%VERSION%%-3 ] || ln -sf /usr/local/lib/libutf8proc1.so.%%VERSION%%-3 %D/lib/libutf8proc1.so.1
+
+