2 files changed, 18 insertions, 29 deletions

diff --git a/x11-fonts/alfont/Makefile b/x11-fonts/alfont/Makefile
index 63e004092b21..5459096d4b1a 100644
--- a/x11-fonts/alfont/Makefile
+++ b/x11-fonts/alfont/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	alfont
-PORTVERSION=	209
-PORTREVISION=	3
+PORTVERSION=	2.0.9
+PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://opensnc.sourceforge.net/alfont/mirror/
-DISTNAME=	AlFont${DISTVERSION}
+DISTNAME=	AlFont${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.rar
 DIST_SUBDIR=	${PORTNAME}
 
@@ -16,7 +16,7 @@ COMMENT=	Wrapper around the freetype2 library
 LICENSE=	FTL
 LICENSE_NAME=	The FreeType Project LICENSE (FTL)
 LICENSE_FILE=	${WRKSRC}/docs/FTL.txt
-LICENSE_PERMS=	auto-accept
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 EXTRACT_DEPENDS=	unrar:archivers/unrar
 LIB_DEPENDS=	liballeg.so.4:devel/allegro \
@@ -27,33 +27,23 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		dos2unix gmake iconv
 USE_LDCONFIG=	yes
 
+EXTRACT_CMD=		${LOCALBASE}/bin/unrar
+EXTRACT_BEFORE_ARGS=	x -y -idq
+EXTRACT_AFTER_ARGS=
+
 CPPFLAGS+=	-Iinclude -I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/freetype2 $$(freetype-config --cflags)
 LDFLAGS+=	-L${LOCALBASE}/lib -lalleg $$(freetype-config --libs)
 
 PLIST_FILES=	include/alfont.h \
 		include/alfontdll.h \
-		lib/libalfont.so.${MAJORVER} \
+		lib/libalfont.so.${PORTVERSION} \
 		lib/libalfont.so
 
 PORTDOCS=	*
 
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	CHANGES.txt README.txt
-
-DOCSRCDIR2=	${WRKSRC}/docs
-DOCSDIR2=	${DOCSDIR}/docs
-DOC_FILES2=	ALFONT.txt AUTHORS.txt
-
 OPTIONS_DEFINE=	DOCS
 
-MAJORVER=	${PORTVERSION:S/209/2.0.9/}
-
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && ${LOCALBASE}/bin/unrar x -y -idq \
-		${_DISTDIR}/AlFont${DISTVERSION}.rar
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|#define ALFONT_WINDOWS|//#define ALFONT_WINDOWS|; \
@@ -64,20 +54,20 @@ post-patch:
 do-build:
 	cd ${WRKSRC} ; ${CC} ${CPPFLAGS} -fPIC -DPIC -c src/alfont.c -o \
 		src/alfont.o
-	cd ${WRKSRC} ; ${CC} -shared ${LDFLAGS} src/alfont.o -o \
-		libalfont.so.${MAJORVER}
+	cd ${WRKSRC} ; ${CC} -shared ${LDFLAGS} -Wl,-soname=libalfont.so.${PORTVERSION} \
+		src/alfont.o -o libalfont.so.${PORTVERSION}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libalfont.so.${MAJORVER} \
+	${INSTALL_DATA} ${WRKSRC}/libalfont.so.${PORTVERSION} \
 		${STAGEDIR}${PREFIX}/lib
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libalfont.so.${MAJORVER}
-	@(cd ${STAGEDIR}${PREFIX}/lib ; ${LN} -sf libalfont.so.${MAJORVER} \
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libalfont.so.${PORTVERSION}
+	@(cd ${STAGEDIR}${PREFIX}/lib ; ${LN} -sf libalfont.so.${PORTVERSION} \
 		libalfont.so)
 	${INSTALL_DATA} ${WRKSRC}/include/alfont*.h ${STAGEDIR}${PREFIX}/include
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+	cd ${WRKSRC} && ${INSTALL_DATA} CHANGES.txt README.txt docs/ALFONT.txt \
+		docs/AUTHORS.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/alfont/distinfo b/x11-fonts/alfont/distinfo
index 2e7932833ea6..6c1edc3e1852 100644
--- a/x11-fonts/alfont/distinfo
+++ b/x11-fonts/alfont/distinfo
@@ -1,4 +1,3 @@
+TIMESTAMP = 1532769735
 SHA256 (alfont/AlFont209.rar) = 734f7f9758dfb3b80979baf010245d931c9cd2a7557683906c7fc616353f960d
 SIZE (alfont/AlFont209.rar) = 3696983
-SHA256 (alfont/alfont.c) = c9117c82131376b99d94d8aa5678b5724f14b3649b42abf08ec46cd9df00e0ae
-SIZE (alfont/alfont.c) = 147298