- disable X11 by default

- remove local.conf which is obsoleted
- properly stage

5 files changed, 14 insertions, 38 deletions

diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile
index 07222f1a5844..638bd58fc6fd 100644
--- a/chinese/fireflyttf/Makefile
+++ b/chinese/fireflyttf/Makefile
@@ -16,13 +16,17 @@ CONFLICTS=	zh-opendesktop-fonts-*
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
-OPTIONS_DEFINE=	LGJ_FONT X11
-OPTIONS_DEFAULT=	LGJ_FONT X11
-LGJ_FONT_DESC=	Patch for Taiwan horn
 
 TTF=		fireflysung.ttf
+PLIST_FILES=	${FONTSDIR_REL}/local.conf-sung
+
+OPTIONS_DEFAULT+=LGJ_FONT
 
 .include <bsd.port.pre.mk>
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
+
+OPTIONS_DEFINE+=LGJ_FONT
+LGJ_FONT_DESC=	Patch for Taiwan horn
 
 .if ${PORT_OPTIONS:MLGJ_FONT}
 PKGNAMESUFFIX+=	-LGJ
@@ -30,12 +34,6 @@ MASTER_SITES=	http://edt1023.sayya.org/fonts/
 DISTNAME=	fireflysung-1.3.0p1
 .endif
 
-.if ${PORT_OPTIONS:MX11}
-PLIST_SUB+=	X11=""
-.else
-PLIST_SUB+=	X11="@comment "
-.endif
-
 post-extract:
 .if ${PORT_OPTIONS:MLGJ_FONT}
 	@${TAR} -C ${WRKSRC} -zxf ${DISTDIR}/fireflysung-1.3.0p1.tar.gz \
@@ -47,12 +45,8 @@ post-extract:
 .endif
 
 do-install:
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${TTF} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${STAGEDIR}${FONTSDIR}
-.if ${PORT_OPTIONS:MX11}
-	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${LOCALBASE}/etc/fonts/local.conf
-.endif
 
-.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/fireflyttf/pkg-plist b/chinese/fireflyttf/pkg-plist
deleted file mode 100644
index 7fa95af62ca7..000000000000
--- a/chinese/fireflyttf/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%X11%%@unexec if cmp -s %%LOCALBASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-sung; then rm -f %%LOCALBASE%%/etc/fonts/local.conf; fi
-%%FONTSDIR%%/local.conf-sung
-%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-sung %%LOCALBASE%%/etc/fonts/local.conf
diff --git a/chinese/opendesktop-fonts/Makefile b/chinese/opendesktop-fonts/Makefile
index 7cde21459ba4..ba0de62955bb 100644
--- a/chinese/opendesktop-fonts/Makefile
+++ b/chinese/opendesktop-fonts/Makefile
@@ -16,14 +16,10 @@ DIST_SUBDIR=	OpenFonts
 NO_BUILD=	yes
 
 TTF=		odokai-ExtB.ttf odokai.ttf odosung-ExtB.ttf odosung.ttc
+PLIST_FILES=	${FONTSDIR_REL}/local.conf-odo
 
 .include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_X11)
-PLIST_SUB+=	X11=""
-.else
-PLIST_SUB+=	X11="@comment "
-.endif
+.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 
 post-extract:
 	@${CHMOD} 0755 ${WRKSRC}/license
@@ -35,15 +31,10 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
 do-install:
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 .for i in ${TTF}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${FONTSDIR}
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${FONTSDIR}
-.if !defined(WITHOUT_X11)
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts
-	${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${PREFIX}/etc/fonts/local.conf
-.endif
 
-.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
 .include <bsd.port.post.mk>
diff --git a/chinese/opendesktop-fonts/pkg-plist b/chinese/opendesktop-fonts/pkg-plist
deleted file mode 100644
index 9fc256177cc7..000000000000
--- a/chinese/opendesktop-fonts/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-etc/fonts/local.conf
-%%X11%%@unexec if cmp -s %%LOCALBASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-odo; then rm -f %%LOCALBASE%%/etc/fonts/local.conf; fi
-%%FONTSDIR%%/local.conf-odo
-%%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-odo %%LOCALBASE%%/etc/fonts/local.conf
-@dirrmtry etc/fonts
diff --git a/chinese/ttfm/Makefile.ttf b/chinese/ttfm/Makefile.ttf
index 91ca41cf5053..590323dbd1cb 100644
--- a/chinese/ttfm/Makefile.ttf
+++ b/chinese/ttfm/Makefile.ttf
@@ -8,8 +8,7 @@
 # TTF		- Name(s) of font file(s) installed in FONTSDIR. Mandatory.
 #
 
-OPTIONS_DEFINE+=	GHOSTSCRIPT X11
-OPTIONS_DEFAULT+=	X11
+OPTIONS_DEFINE+=GHOSTSCRIPT X11
 
 .include <bsd.port.options.mk>
 
@@ -42,8 +41,8 @@ check-makefile-ttf:
 .else
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "You may use the following options:"
-	@${ECHO_CMD} "	${OPTIONS_NAME}_SET=GHOSTSCRIPT		- if you want Ghostscript support"
-	@${ECHO_CMD} "	${OPTIONS_NAME}_UNSET=X11	- if you DON'T want X Window support"
+	@${ECHO_CMD} "	${OPTIONS_NAME}_SET+=GHOSTSCRIPT	- if you want Ghostscript support"
+	@${ECHO_CMD} "	${OPTIONS_NAME}_SET+=X11		- if you want X Window support"
 	@${ECHO_CMD} ""
 .endif
 .if !defined(TTF)