From 4f0a28d655158cdfbd3d9d29fe8b4556ed13df82 Mon Sep 17 00:00:00 2001
From: Jing-Tang Keith Jang <keith@FreeBSD.org>
Date: Tue, 30 Jan 2001 14:18:07 +0000
Subject: Drop gmake dependency during build.

Submitted by:	kevlo, modified by me to respect CFLAGS.
---
 chinese/bg5ps/Makefile       |  1 -
 chinese/bg5ps/files/patch-aa | 36 +++++++++++++++++-------------------
 2 files changed, 17 insertions(+), 20 deletions(-)

(limited to 'chinese/bg5ps')

diff --git a/chinese/bg5ps/Makefile b/chinese/bg5ps/Makefile
index 0d7987793c06..35fbe486d37b 100644
--- a/chinese/bg5ps/Makefile
+++ b/chinese/bg5ps/Makefile
@@ -13,7 +13,6 @@ DISTNAME=	bg5ps-1.3.0
 
 MAINTAINER=	keith@FreeBSD.org
 
-USE_GMAKE=	yes
 USE_FREETYPE=	yes
 USE_PYTHON=	yes
 
diff --git a/chinese/bg5ps/files/patch-aa b/chinese/bg5ps/files/patch-aa
index 1f63ef755949..74dae73e0c41 100644
--- a/chinese/bg5ps/files/patch-aa
+++ b/chinese/bg5ps/files/patch-aa
@@ -1,34 +1,32 @@
---- Makefile.orig	Thu Nov  2 22:44:32 2000
-+++ Makefile	Thu Nov  2 22:47:11 2000
-@@ -21,11 +21,13 @@
+--- Makefile.orig	Tue Feb 15 04:41:27 2000
++++ Makefile	Tue Jan 30 22:01:34 2001
+@@ -19,21 +19,22 @@
+ 
+ CC = gcc
  INSTALL = install
- CFLAGS =
+-CFLAGS =
++CFLAGS += -I${LOCALBASE}/include
  LIBS = -lttf -lm
 -INCLUDEDIR = 
-+LIBSDIR = -L/usr/local/lib
-+INCLUDEDIR = -I/usr/local/include
++LIBSDIR = -L${LOCALBASE}/lib
  
 -prefix = /usr
-+
-+prefix = /usr/local
- BINDIR = $(prefix)/bin
+-BINDIR = $(prefix)/bin
 -ETCDIR = /etc/chinese/
-+ETCDIR = /usr/local/etc/etc
++
++PREFIX?= /usr/local
++BINDIR = $(PREFIX)/bin
++ETCDIR = $(PREFIX)/etc
  
  all: ttf2psm
  
-@@ -33,12 +35,12 @@
- 	$(CC) -c $(CFLAGS) $(INCLUDEDIR) $< -o $@
+ %.o : %.c
+-	$(CC) -c $(CFLAGS) $(INCLUDEDIR) $< -o $@
++	$(CC) -c $(CFLAGS) $< -o $@
  
  ttf2psm: $(OBJS)
 -	$(CC) $(CFLAGS) $(INCLUDEDIR) $(LIBS) -o ttf2psm $(OBJS)
-+	$(CC) $(CFLAGS) $(INCLUDEDIR) $(LIBSDIR) $(LIBS) -o ttf2psm $(OBJS)
++	$(CC) $(CFLAGS) $(LIBSDIR) $(LIBS) -o ttf2psm $(OBJS)
  
  install: all bg5ps bg5ps.conf
  	mkdir -p $(ETCDIR)
- 	mkdir -p $(BINDIR)
--	$(INSTALL) -m644 bg5ps.conf $(ETCDIR)/bg5ps.conf
-+	$(INSTALL) -m644 bg5ps.conf $(ETCDIR)/bg5ps.conf.sample
- 	$(INSTALL) -m755 bg5ps $(BINDIR)
- 	$(INSTALL) -m755 ttf2psm $(BINDIR)
- 
-- 
cgit v1.2.3