svn commit: r355069 - head/japanese/kterm
Hiroki Sato
hrs at FreeBSD.org
Sat May 24 18:10:10 UTC 2014
Author: hrs
Date: Sat May 24 18:10:10 2014
New Revision: 355069
URL: http://svnweb.freebsd.org/changeset/ports/355069
QAT: https://qat.redports.org/buildarchive/r355069/
Log:
- STAGEDIR support.
- Fix BUILD_DEPENDS when VGAFONT defined.
Modified:
head/japanese/kterm/Makefile
head/japanese/kterm/pkg-plist (contents, props changed)
Modified: head/japanese/kterm/Makefile
==============================================================================
--- head/japanese/kterm/Makefile Sat May 24 18:05:30 2014 (r355068)
+++ head/japanese/kterm/Makefile Sat May 24 18:10:10 2014 (r355069)
@@ -39,74 +39,60 @@ BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/
USES= imake
USE_XORG= xaw
CFLAGS+= -Wno-return-type
-
-MAN1= kterm.1
-MANLANG= "" ja
-
-.if !defined(NOPORTDOCS)
PORTDOCS= README.kt README.wallpaper.ja dot.termcap
-.endif
OPTIONS_DEFINE= TEKTRONIXEMU VGAFONT
OPTIONS_DEFAULT= DEFAULT
OPTIONS_SINGLE= SCROLLBAR
OPTIONS_SINGLE_SCROLLBAR= DEFAULT XAW3DLIB NEXTAWLIB
+OPTIONS_SUB= yes
-XAW3DLIB_DESC= with Xaw3d scrollbar
-NEXTAWLIB_DESC= with neXtaw scrollbar
-TEKTRONIXEMU_DESC= Tektronix emulation
-VGAFONT_DESC= install VGA font
+XAW3DLIB_DESC= with Xaw3d scrollbar
+LIB_DEPENDS_XAW3DLIB= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+EXTRA_PATCHES_XAW3DLIB= ${PATCHDIR}/extra-patch-Xaw3d
+
+NEXTAWLIB_DESC= with neXtaw scrollbar
+LIB_DEPENDS_NEXTAWLIB= libneXtaw.so:${PORTSDIR}/x11-toolkits/neXtaw
+EXTRA_PATCHES_NEXTAWLIB=${PATCHDIR}/extra-patch-neXtaw
+
+TEKTRONIXEMU_DESC= Tektronix emulation
+EXTRA_PATCHES_TEKTRONIXEMU=${PATCHDIR}/extra-patch-Tektronix
+
+VGAFONT_DESC= install VGA font
+BUILD_DEPENDS_VGAFONT= \
+ ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+ ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
+ ${LOCALBASE}/bin/bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
NKFCMD= ${LOCALBASE}/bin/nkf
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MXAW3DLIB}
-LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Xaw3d
-.endif
-.if ${PORT_OPTIONS:MNEXTAWLIB}
-LIB_DEPENDS+= neXtaw:${PORTSDIR}/x11-toolkits/neXtaw
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-neXtaw
-.endif
-
-.if ${PORT_OPTIONS:MTEKTRONIXEMU}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Tektronix
-.endif
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MVGAFONT}
-PLIST_SUB= VGAFONT=""
post-extract:
${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
- ${DISTDIR}/${DIST_SUBDIR}/pcemu1.01alpha.tar.gz \
- ${EXTRACT_AFTER_ARGS} -C ${WRKDIR} pcemu1.01alpha/vga.bdf
+ ${DISTDIR}/${DIST_SUBDIR}/pcemu1.01alpha.tar.gz \
+ ${EXTRACT_AFTER_ARGS} -C ${WRKDIR} pcemu1.01alpha/vga.bdf
cd ${WRKDIR}/pcemu1.01alpha && \
- ${LOCALBASE}/bin/bdftopcf vga.bdf | ${GZIP_CMD} > vga.pcf.gz
+ ${LOCALBASE}/bin/bdftopcf vga.bdf | ${GZIP_CMD} > vga.pcf.gz
post-install-vgafont:
- ${MKDIR} ${PREFIX}/lib/X11/fonts/misc
+ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/misc
${INSTALL_DATA} ${WRKDIR}/pcemu1.01alpha/vga.pcf.gz \
- ${PREFIX}/lib/X11/fonts/misc
- ${LOCALBASE}/bin/mkfontdir ${PREFIX}/lib/X11/fonts/misc
+ ${STAGEDIR}${PREFIX}/lib/X11/fonts/misc
post-install: post-install-vgafont
-.else
-PLIST_SUB= VGAFONT="@comment "
.endif
post-build:
${NKFCMD} -e -u ${WRKSRC}/kterm.jman \
- | ${GZIP_CMD} > ${WRKSRC}/${MAN1}.gz
+ | ${GZIP_CMD} > ${WRKSRC}/kterm.1.gz
post-install:
- ${INSTALL_MAN} ${WRKSRC}/${MAN1}.gz ${MANPREFIX}/man/ja/man1
-.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
+ ${INSTALL_MAN} ${WRKSRC}/kterm.1.gz ${STAGEDIR}${MANPREFIX}/man/ja/man1
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} \
- ${WRKSRC}/README.kt \
- ${DISTDIR}/${DIST_SUBDIR}/README.wallpaper.ja \
- ${FILESDIR}/dot.termcap \
- ${DOCSDIR}/README.wallpaper.ja \
- ${DOCSDIR}
-.endif
+ ${WRKSRC}/README.kt \
+ ${DISTDIR}/${DIST_SUBDIR}/README.wallpaper.ja \
+ ${FILESDIR}/dot.termcap \
+ ${STAGEDIR}${DOCSDIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/japanese/kterm/pkg-plist
==============================================================================
--- head/japanese/kterm/pkg-plist Sat May 24 18:05:30 2014 (r355068)
+++ head/japanese/kterm/pkg-plist Sat May 24 18:10:10 2014 (r355069)
@@ -1,5 +1,9 @@
+ at comment $FreeBSD$
bin/kterm
+man/ja/man1/kterm.1.gz
+man/man1/kterm.1.gz
lib/X11/app-defaults/KTerm
%%VGAFONT%%lib/X11/fonts/misc/vga.pcf.gz
%%VGAFONT%%@exec %D/bin/mkfontdir %D/lib/X11/fonts/misc
%%VGAFONT%%@unexec %D/bin/mkfontdir %D/lib/X11/fonts/misc; if [ `/usr/bin/wc -c < %D/lib/X11/fonts/misc/fonts.dir` = 2 ]; then /bin/rm -f %D/lib/X11/fonts/misc/fonts.dir; fi
+%%VGAFONT%%@dirrmtry lib/X11/fonts/misc
More information about the svn-ports-head
mailing list