3 files changed, 23 insertions, 25 deletions

diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index a35364b6ebaf..d98501babfd5 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -6,28 +6,28 @@
 #
 
 PORTNAME=	shinonome
-PORTVERSION=	0.9.11
-PORTREVISION=	1
+PORTVERSION=	0.9.11p1
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://openlab.ring.gr.jp/efont/dist/shinonome/%SUBDIR%/
+MASTER_SITES=	http://openlab.jp/efont/dist/shinonome/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese 12,14,16 dot fonts
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/p.*$//}
 
 USE_BZIP2=	yes
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-FONTSDIR=	lib/X11/fonts/local
-DOCSDIR=	share/doc/shinonome
-CONFIGURE_ARGS=	--with-fontdir=${PREFIX}/${FONTSDIR} --enable-compress
+
+PLIST_SUB=	FONTSDIR="${FONTSDIR_REL}"
 
 .include <bsd.port.pre.mk>
 
+FONTSDIR=	${PREFIX}/lib/X11/fonts/local
+FONTSDIR_REL=	${FONTSDIR:S,^${PREFIX}/,,}
+
 FONTNAMES=\
 	shnm6x12a    shnm6x12ab   shnm6x12ai   shnm6x12abi   \
 	shnm6x12r    shnm6x12rb   shnm6x12ri   shnm6x12rbi   \
@@ -48,32 +48,30 @@ FONTNAMES=\
 DOCS=	AUTHORS BUGS ChangeLog ChangeLog.0 DESIGN.12 DESIGN.14 \
 	DESIGN.16 DESIGN.18 INSTALL README THANKS TODO LICENSE
 
-PLIST_SUB+=	FONTSDIR=${FONTSDIR} DOCSDIR=${DOCSDIR}
-
-post-build:
+do-build:
 	@${ECHO_CMD} -n 'Compressing PCF fonts'
 .for i in ${FONTNAMES}
 	@${ECHO_CMD} -n '.'
-	@cd ${WRKSRC}; ${GZIP_CMD} ${i}.pcf
+	@cd ${WRKSRC}; bdftopcf bdf/${i}.bdf | ${GZIP_CMD} > ${i}.pcf.gz
 .endfor
 	@${ECHO_CMD} 'Done'
 
 pre-su-install:
-	@${MKDIR} ${PREFIX}/${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/fonts.alias ${PREFIX}/${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${DOCSDIR}
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
 do-install:
 # Do not use original install target since it forces to delete fonts.alias
 .for i in ${FONTNAMES}
-	${INSTALL_DATA} ${WRKSRC}/${i}.pcf.gz ${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i}.pcf.gz ${FONTSDIR}
 .endfor
-	@mkfontdir ${PREFIX}/${FONTSDIR}
-	@${CAT} ${PREFIX}/${DOCSDIR}/fonts.alias >> ${PREFIX}/${FONTSDIR}/fonts.alias
+	@mkfontdir ${FONTSDIR}
+	@${CAT} ${DOCSDIR}/fonts.alias >> ${FONTSDIR}/fonts.alias
 .if !defined(NOPORTDOCS)
 .for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/font-shinonome/distinfo b/japanese/font-shinonome/distinfo
index fac53f107f4f..77d1b6f63013 100644
--- a/japanese/font-shinonome/distinfo
+++ b/japanese/font-shinonome/distinfo
@@ -1,3 +1,3 @@
-MD5 (shinonome-0.9.11.tar.bz2) = 54331706d90274d93eddada76e665afe
-SHA256 (shinonome-0.9.11.tar.bz2) = 40c0f54659042c33541510c894bcc769b104867f186285e7cf32971ca6add63b
-SIZE (shinonome-0.9.11.tar.bz2) = 4943752
+MD5 (shinonome-0.9.11p1.tar.bz2) = 5fb94de9a9971ac67a4d53d62f77bc1d
+SHA256 (shinonome-0.9.11p1.tar.bz2) = 95663c95c92ba5765f63ccbdf033eb93b707be01812a989c548db943479c838f
+SIZE (shinonome-0.9.11p1.tar.bz2) = 4814008
diff --git a/japanese/font-shinonome/pkg-descr b/japanese/font-shinonome/pkg-descr
index 75f1c4e381fc..070d1bcecf0c 100644
--- a/japanese/font-shinonome/pkg-descr
+++ b/japanese/font-shinonome/pkg-descr
@@ -1,3 +1,3 @@
 shinonome fonts - japanese public domain fonts
 
-WWW: http://openlab.ring.gr.jp/efont/shinonome/
+WWW: http://openlab.jp/efont/shinonome/