From 59a53736bb7a8794f01c2490329fd5fca8db0ade Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Fri, 9 May 2014 19:26:34 +0000 Subject: - Add staging support - Respect CFLAGS during build --- japanese/kcc/Makefile | 5 +---- japanese/kcc/files/patch-aa | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/japanese/kcc/Makefile b/japanese/kcc/Makefile index 3f444aa9f5d5..6e899e528884 100644 --- a/japanese/kcc/Makefile +++ b/japanese/kcc/Makefile @@ -12,9 +12,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Kanji code conversion Filter INSTALL_TARGET= install install.man -MANLANG= ja -MAN1= kcc.1 -PLIST_FILES= bin/kcc +PLIST_FILES= bin/kcc man/ja/man1/kcc.1.gz -NO_STAGE= yes .include diff --git a/japanese/kcc/files/patch-aa b/japanese/kcc/files/patch-aa index 945f635424ac..374a9e57c8ef 100644 --- a/japanese/kcc/files/patch-aa +++ b/japanese/kcc/files/patch-aa @@ -1,23 +1,31 @@ ---- Makefile.orig Mon Mar 28 20:05:28 1994 -+++ Makefile Mon Jun 23 21:24:12 1997 -@@ -7,15 +7,16 @@ +--- Makefile.orig 1994-03-28 13:05:28.000000000 +0200 ++++ Makefile 2014-05-09 21:13:14.000000000 +0200 +@@ -7,10 +7,11 @@ # @(#)Makefile 2.3 (Y.Tonooka) 3/28/94 - BINPATH = /usr/local/bin - MANPATH = /usr/local/man - JMANDIR = japanese +- CFLAGS = -O + PREFIX?= /usr/local + BINPATH = ${PREFIX}/bin + MANPATH = ${PREFIX}/man + JMANDIR = ja - CFLAGS = -O ++ CFLAGS?= -O SHELL = /bin/sh CP = cp - MAKE = make -- INSTALL = install -+ INSTALL = install -c +@@ -34,10 +35,10 @@ - CMDS = kcc - SRCS = kcc.c + $(BINPATH)/kcc: kcc.c + $(MAKE) kcc +- $(INSTALL) -s kcc $(BINPATH) ++ $(BSD_INSTALL_PROGRAM) kcc $(DESTDIR)$(BINPATH) + + $(MANPATH)/$(JMANDIR)/man1/kcc.1: kcc.jman +- $(INSTALL) -m 644 kcc.jman $@ ++ $(BSD_INSTALL_MAN) kcc.jman $(DESTDIR)$(MANPATH)/$(JMANDIR)/man1/kcc.1 + + clean: + rm -f $(CMDS) $(OBJS) mon.out gmon.out make.log -- cgit v1.2.3