6 files changed, 18 insertions, 20 deletions

diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile
index 2a411cee4724..dbb020386583 100644
--- a/chinese/kcfonts/Makefile
+++ b/chinese/kcfonts/Makefile
@@ -14,15 +14,9 @@ COMMENT=	Kuo Chauo Chinese Fonts collection
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
-MAKE_JOBS_UNSAFE=yes
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not build on sparc64
-.endif
+#MAKE_JOBS_UNSAFE=yes
+BROKEN_sparc64=		Does not build on sparc64
 
 NO_WRKSUBDIR=	yes
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/kcfonts/files/patch-aa b/chinese/kcfonts/files/patch-Makefile
index 4b93815e31ea..a0cb3c664a3e 100644
--- a/chinese/kcfonts/files/patch-aa
+++ b/chinese/kcfonts/files/patch-Makefile
@@ -1,5 +1,5 @@
 --- Makefile.orig	1995-12-17 04:00:46.000000000 +0800
-+++ Makefile	2011-09-05 11:35:47.000000000 +0800
++++ Makefile	2014-08-07 23:38:12.048102848 +0800
 @@ -2,17 +2,17 @@
  #	Kau Chauo Chinese Fanti Ming Fonts Version 1.05 For FreeBSD
  #
@@ -40,13 +40,19 @@
  
  kc24f:		tran.o kc24f.o
  	$(CC) $(CFLAGS) tran.o kc24f.o -o $@
-@@ -42,7 +46,9 @@ install:
- 	if [ ! -d $(CFONTDIR) ]; then mkdir $(CFONTDIR); fi
- 	cp kc*f.pcf.gz $(CFONTDIR)
- 	cp kc*x*.pcf.gz $(EFONTDIR)
-+	cp kc_fonts.alias $(CFONTDIR)
- 	mkfontdir $(CFONTDIR)
-+	cd ${PREFIX}/lib/X11/fonts/local ; cat kc_fonts.alias >> fonts.alias ; cp fonts.alias ..fonts.alias.. ; sort ..fonts.alias.. | uniq > fonts.alias ; rm ..fonts.alias..
- 	mkfontdir $(EFONTDIR)
+@@ -39,11 +43,10 @@ kca2et:		kca2et.o
+ 	$(CC) $(CFLAGS) kca2et.o -o $@
+ 
+ install:
+-	if [ ! -d $(CFONTDIR) ]; then mkdir $(CFONTDIR); fi
+-	cp kc*f.pcf.gz $(CFONTDIR)
+-	cp kc*x*.pcf.gz $(EFONTDIR)
+-	mkfontdir $(CFONTDIR)
+-	mkfontdir $(EFONTDIR)
++	if [ ! -d $(DESTDIR)$(CFONTDIR) ]; then mkdir $(DESTDIR)$(CFONTDIR); fi
++	cp kc*f.pcf.gz $(DESTDIR)$(CFONTDIR)
++	cp kc*x*.pcf.gz $(DESTDIR)$(EFONTDIR)
++	cp kc_fonts.alias $(DESTDIR)$(CFONTDIR)
  
  clean:
+ 	rm -f kc*.pcf.gz ascfont.* *.o *~ $(PROGS)
diff --git a/chinese/kcfonts/files/patch-ac b/chinese/kcfonts/files/patch-kc12x24.c
index e40293408dc3..e40293408dc3 100644
--- a/chinese/kcfonts/files/patch-ac
+++ b/chinese/kcfonts/files/patch-kc12x24.c
diff --git a/chinese/kcfonts/files/patch-ad b/chinese/kcfonts/files/patch-kc8x15.diff
index ba84102dae93..ba84102dae93 100644
--- a/chinese/kcfonts/files/patch-ad
+++ b/chinese/kcfonts/files/patch-kc8x15.diff
diff --git a/chinese/kcfonts/files/patch-ab b/chinese/kcfonts/files/patch-kc_fonts.alias
index bae03e9351f1..bae03e9351f1 100644
--- a/chinese/kcfonts/files/patch-ab
+++ b/chinese/kcfonts/files/patch-kc_fonts.alias
diff --git a/chinese/kcfonts/pkg-plist b/chinese/kcfonts/pkg-plist
index 9d60e65d5937..0c15d8f384c6 100644
--- a/chinese/kcfonts/pkg-plist
+++ b/chinese/kcfonts/pkg-plist
@@ -4,8 +4,6 @@ lib/X11/fonts/local/kc15f.pcf.gz
 lib/X11/fonts/local/kc24f.pcf.gz
 lib/X11/fonts/local/kc_fonts.alias
 @exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@exec cd %D/lib/X11/fonts/local ; cat kc_fonts.alias >> fonts.alias ; cp fonts.alias ..fonts.alias.. ; sort ..fonts.alias.. | uniq > fonts.alias ; rm ..fonts.alias..
 @unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@unexec if [ -s %D/lib/X11/fonts/local/fonts.alias ]; then perl -e 'while (<>) { if (!/kc-fixed/) { print <>} }' < %D/lib/X11/fonts/local/fonts.alias > /tmp/fonts.alias.$$; mv /tmp/fonts.alias.$$ %D/lib/X11/fonts/local/fonts.alias; fi
 @unexec if [ `\head -1 %D/lib/X11/fonts/local/fonts.dir` = 0 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
 @unexec if [ ! -s %D/lib/X11/fonts/local/fonts.alias ]; then rm -f %D/lib/X11/fonts/local/fonts.alias; fi