- Add FreeBSD-specific X resource

  * default PS font name is changed to Gulim-Medium
    (from korean/baekmukfonts-ttf)
- more portlint-compliant

4 files changed, 32 insertions, 10 deletions

diff --git a/korean/netscape4-communicator/Makefile b/korean/netscape4-communicator/Makefile
index 7ba25d93e7f5..4166f39c8e23 100644
--- a/korean/netscape4-communicator/Makefile
+++ b/korean/netscape4-communicator/Makefile
@@ -11,12 +11,12 @@ PORTVERSION=	${BROWSER_VERSION}
 CATEGORIES=	korean www
 MASTER_SITES=	ftp://ftp.kr.freebsd.org/pub/users/cjh/netscape-ko/ \
 		http://www.kr.freebsd.org/~cjh/freetime/mozilla/netscape-ko/
-DISTFILES=	${KOREAN_KIT}.tar.gz
+DISTNAME=	${KOREAN_KIT}
 
 MAINTAINER?=	cjh@FreeBSD.org
 
 # ?= for ports that include this Makefile
-RUN_DEPENDS?=	${PREFIX}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER}
+RUN_DEPENDS?=	${LOCALBASE}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER}
 RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf \
 		${X11BASE}/lib/X11/fonts/local/mzgt16h1.pcf.gz:${PORTSDIR}/korean/mizifont
 
@@ -24,7 +24,6 @@ NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/INSTALL
 PLIST_SUB=	NSUBDIR=${NSUBDIR} LANG=${LANG} \
 		BROWSER=${BROWSER_ARC} VER=${BROWSER_VER}
-WRKSRC=		${WRKDIR}/${KOREAN_KIT}
 NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR?=	lib/netscape
 
@@ -45,6 +44,7 @@ KOREAN_KIT?=	netscape-v408.generic-generic-generic-19990612
 
 NETHELP?=	nethelp-v403
 START_SCRIPT?=	${MASTERDIR}/files/start.sh.in
+ADDXRESOURCE?=	${MASTERDIR}/files/xresource.ad
 
 LANG=		ko_KR.EUC
 MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
@@ -64,7 +64,10 @@ DIST_SUBDIR=    korean-netscape
 
 do-configure:
 	${MAKESCRIPT} ${START_SCRIPT} >${WRKDIR}/start.sh
-	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ko >${WRKSRC}/Netscape
+	# add FreeBSD-specific resource
+	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ko >${WRKSRC}/Netscape.2.ad
+	${CAT} ${WRKSRC}/Netscape.2.ad ${ADDXRESOURCE} \
+		> ${WRKSRC}/Netscape
 	${MAKESCRIPT} ${FILESDIR}/INSTALL >${PKGINSTALL}
 	# make navigator resource
 .if defined(BROWSER) && ${BROWSER} == navigator
@@ -77,7 +80,6 @@ do-configure:
 	${CP} ${WRKSRC}/splash ${WRKDIR}/splash
 .endif
 
-
 do-install:
 	${INSTALL_DATA} ${MASTERDIR}/files/preferences.js ${NDIR}
 	${MKDIR} ${NDIR}/locale
diff --git a/korean/netscape4-communicator/files/xresource.ad b/korean/netscape4-communicator/files/xresource.ad
new file mode 100644
index 000000000000..bc6e66aee955
--- /dev/null
+++ b/korean/netscape4-communicator/files/xresource.ad
@@ -0,0 +1,9 @@
+! Additional resources, FreeBSD specific
+!  2000/7/15 CHOI Junho <cjh@freebsd.org>
+!
+! These fonts is available from korean/ftghostscript* ports.
+!  and korean/baekmukfonts-ttf.
+!
+*documentFonts.EUC-KR*psname:	Gulim-Medium-KSC-EUC-H
+*documentFonts.EUC-KR*pswidth:	1000
+*documentFonts.EUC-KR*psascent:	880
diff --git a/korean/netscape48-communicator/Makefile b/korean/netscape48-communicator/Makefile
index 7ba25d93e7f5..4166f39c8e23 100644
--- a/korean/netscape48-communicator/Makefile
+++ b/korean/netscape48-communicator/Makefile
@@ -11,12 +11,12 @@ PORTVERSION=	${BROWSER_VERSION}
 CATEGORIES=	korean www
 MASTER_SITES=	ftp://ftp.kr.freebsd.org/pub/users/cjh/netscape-ko/ \
 		http://www.kr.freebsd.org/~cjh/freetime/mozilla/netscape-ko/
-DISTFILES=	${KOREAN_KIT}.tar.gz
+DISTNAME=	${KOREAN_KIT}
 
 MAINTAINER?=	cjh@FreeBSD.org
 
 # ?= for ports that include this Makefile
-RUN_DEPENDS?=	${PREFIX}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER}
+RUN_DEPENDS?=	${LOCALBASE}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER}
 RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf \
 		${X11BASE}/lib/X11/fonts/local/mzgt16h1.pcf.gz:${PORTSDIR}/korean/mizifont
 
@@ -24,7 +24,6 @@ NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/INSTALL
 PLIST_SUB=	NSUBDIR=${NSUBDIR} LANG=${LANG} \
 		BROWSER=${BROWSER_ARC} VER=${BROWSER_VER}
-WRKSRC=		${WRKDIR}/${KOREAN_KIT}
 NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR?=	lib/netscape
 
@@ -45,6 +44,7 @@ KOREAN_KIT?=	netscape-v408.generic-generic-generic-19990612
 
 NETHELP?=	nethelp-v403
 START_SCRIPT?=	${MASTERDIR}/files/start.sh.in
+ADDXRESOURCE?=	${MASTERDIR}/files/xresource.ad
 
 LANG=		ko_KR.EUC
 MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
@@ -64,7 +64,10 @@ DIST_SUBDIR=    korean-netscape
 
 do-configure:
 	${MAKESCRIPT} ${START_SCRIPT} >${WRKDIR}/start.sh
-	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ko >${WRKSRC}/Netscape
+	# add FreeBSD-specific resource
+	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ko >${WRKSRC}/Netscape.2.ad
+	${CAT} ${WRKSRC}/Netscape.2.ad ${ADDXRESOURCE} \
+		> ${WRKSRC}/Netscape
 	${MAKESCRIPT} ${FILESDIR}/INSTALL >${PKGINSTALL}
 	# make navigator resource
 .if defined(BROWSER) && ${BROWSER} == navigator
@@ -77,7 +80,6 @@ do-configure:
 	${CP} ${WRKSRC}/splash ${WRKDIR}/splash
 .endif
 
-
 do-install:
 	${INSTALL_DATA} ${MASTERDIR}/files/preferences.js ${NDIR}
 	${MKDIR} ${NDIR}/locale
diff --git a/korean/netscape48-communicator/files/xresource.ad b/korean/netscape48-communicator/files/xresource.ad
new file mode 100644
index 000000000000..bc6e66aee955
--- /dev/null
+++ b/korean/netscape48-communicator/files/xresource.ad
@@ -0,0 +1,9 @@
+! Additional resources, FreeBSD specific
+!  2000/7/15 CHOI Junho <cjh@freebsd.org>
+!
+! These fonts is available from korean/ftghostscript* ports.
+!  and korean/baekmukfonts-ttf.
+!
+*documentFonts.EUC-KR*psname:	Gulim-Medium-KSC-EUC-H
+*documentFonts.EUC-KR*pswidth:	1000
+*documentFonts.EUC-KR*psascent:	880