4 files changed, 16 insertions, 75 deletions

diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index 38bae0d1dd07..1071b1780218 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	code2000
-PORTVERSION=	1.15
+PORTVERSION=	1.16
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://home.att.net/~jameskass/
 DISTFILES=	${PORTNAME:U}${EXTRACT_SUFX:U}
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	thierry@pompo.net
+MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Shareware demo Unicode TrueType font
 
 BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir
@@ -22,30 +22,11 @@ NO_PACKAGE=	Only unmodified original package can be distributed
 USE_X_PREFIX=	yes
 USE_ZIP=	yes
 
-.include <bsd.port.pre.mk>
+PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-RUN_DEPENDS=	xfstt:${PORTSDIR}/x11-servers/Xfstt
-.endif
-
-PLIST_SUB=	PKG_OLDXF86=${PKG_OLDXF86} \
-		PKG_NSALIAS=${PKG_NSALIAS} \
-		FONTNAME="${FONTNAME}" \
-		FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \
-		TTFONTSDIR="${TTFONTSDIR:S|${X11BASE}/||}"
-
-MSG_FILE=	${PKGDIR}/pkg-message
+SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-OLDXF86=	""
-.else
-OLDXF86=	"@comment "
-.endif
-
-#
-# Local variables
-#
+SUB_LIST=	FONTSDIR=${FONTSDIR}
 
 FONTNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
@@ -53,10 +34,6 @@ TTFONTSDIR?=	${X11BASE}/lib/X11/fonts/TrueType
 
 TTMKFDIR_CMD?=	${X11BASE}/bin/ttmkfdir
 
-#
-# Post-extract
-#
-
 post-extract: move-fonts rename-license
 
 move-fonts:
@@ -66,52 +43,26 @@ move-fonts:
 rename-license:
 	${MV} ${WRKDIR}/CODE2000.HTM ${WRKSRC}/${FONTNAME}.html
 
-#
-# Post-patch
-#
-
-post-patch:
-	@${SED} 's|%%FONTSDIR%%|${FONTSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
-
-#
-# Build
-#
-
 do-build: make-fonts.scale make-fonts.dir
 
 make-fonts.scale:
-	${TTMKFDIR_CMD} -c -f JJK -d ${WRKSRC} | ${CAT} -n | ${SED} -e ' \
+	cd ${WRKSRC} && ${TTMKFDIR_CMD} -c -f JJK -d .
+	${CAT} -n ${WRKSRC}/fonts.scale | ${SED} -e ' \
 		s,^     1,100000,; \
 		s,JJK,${FONTNAME},; \
-	' | ${SORT} -r | ${CUT} -c 8- > ${WRKSRC}/fonts.scale
+	' | ${SORT} -r | ${CUT} -c 8- > ${WRKSRC}/fonts.scale.new
+	${MV} ${WRKSRC}/fonts.scale.new ${WRKSRC}/fonts.scale
 
 make-fonts.dir:
 	${CP} ${WRKSRC}/fonts.scale ${WRKSRC}/fonts.dir
 
-#
-# Install
-#
-
-do-install: install-fonts
-
-install-fonts:
+do-install:
 	${MKDIR} ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/* ${FONTSDIR}
 
-#
-# Post-install
-#
-
-post-install: truetype-link display-message
-
-truetype-link:
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-	${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME}
-.endif
-
-display-message:
+post-install:
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/code2000/distinfo b/x11-fonts/code2000/distinfo
index 446be1ab20db..f80fcd7c735f 100644
--- a/x11-fonts/code2000/distinfo
+++ b/x11-fonts/code2000/distinfo
@@ -1,3 +1,3 @@
-MD5 (code2000-1.15/CODE2000.ZIP) = b64cf503f0d3565256224b4e84ae55df
-SHA256 (code2000-1.15/CODE2000.ZIP) = dc779f5469297d13e357a620f53f2c754d42099976dc3ccc49b5503afcfee756
-SIZE (code2000-1.15/CODE2000.ZIP) = 3950236
+MD5 (code2000-1.16/CODE2000.ZIP) = 5160a65a38f414ee656fd7feaf7c2cec
+SHA256 (code2000-1.16/CODE2000.ZIP) = 447e038be7ea8f833cbcf804408c0935acde520547a244556f7406ba6a4b7788
+SIZE (code2000-1.16/CODE2000.ZIP) = 3710776
diff --git a/x11-fonts/code2000/pkg-message b/x11-fonts/code2000/files/pkg-message.in
index 0ea105ac33c3..104433538946 100644
--- a/x11-fonts/code2000/pkg-message
+++ b/x11-fonts/code2000/files/pkg-message.in
@@ -5,19 +5,11 @@ font by sending $5 (Five U.S. Dollars, or equivalent in any currency)
 to the author. See %%FONTSDIR%%/code2000.html.
 You can start using the font by following these instructions:
 
---- XFree86 4.x.x (using the freetype module)
-
 Make sure that the freetype module is loaded.  If it is not, add the following
-line to the "Modules" section of XF86Config:
+line to the "Modules" section of your X11 / x.org configuration file:
 
 	Load "freetype"
 
 Add the following line to the "Files" section of XF86Config:
 
 	FontPath "%%FONTSDIR%%/"
-
---- XFree86 3.x.x (using Xfstt)
-
-Add the following line to the "Files" section of XF86Config:
-
-	FontPath   "unix/:7101"
diff --git a/x11-fonts/code2000/pkg-plist b/x11-fonts/code2000/pkg-plist
index aa72a999030d..ca1bea296472 100644
--- a/x11-fonts/code2000/pkg-plist
+++ b/x11-fonts/code2000/pkg-plist
@@ -5,5 +5,3 @@
 %%FONTSDIR%%/fonts.scale
 @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || true
 @dirrm %%FONTSDIR%%
-%%PKG_OLDXF86%%@exec ln -fs %D/%%FONTSDIR%% %D/%%TTFONTSDIR%%/%%FONTNAME%%
-%%PKG_OLDXF86%%@unexec rm -f %D/%%TTFONTSDIR%%/%%FONTNAME%%