From f8abd2eec8239172f00058b621bbd5aed0d602cb Mon Sep 17 00:00:00 2001 From: grant Date: Tue, 15 Jun 2004 13:35:20 +0000 Subject: - don't override compiler variables - don't gcc specific flags --- fonts/pcf2bdf/distinfo | 4 ++-- fonts/pcf2bdf/patches/patch-ab | 26 ++++++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) (limited to 'fonts/pcf2bdf') diff --git a/fonts/pcf2bdf/distinfo b/fonts/pcf2bdf/distinfo index 50b3ef6948f..10c18740a4f 100644 --- a/fonts/pcf2bdf/distinfo +++ b/fonts/pcf2bdf/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2004/03/09 14:47:09 agc Exp $ +$NetBSD: distinfo,v 1.3 2004/06/15 13:35:20 grant Exp $ SHA1 (pcf2bdf-1.04.tgz) = 6fdcc10132e27d3c26ff7e4be541332ee5d4e927 Size (pcf2bdf-1.04.tgz) = 9686 bytes SHA1 (patch-aa) = d750333e3ac74db0666a40a6902af02d85d02ba0 -SHA1 (patch-ab) = 067ec5a2c44029b41dac3e29054392df080467a4 +SHA1 (patch-ab) = 570763e32397296c67a88a485171b898b70247ff diff --git a/fonts/pcf2bdf/patches/patch-ab b/fonts/pcf2bdf/patches/patch-ab index 2de3bffea25..4139f564d7f 100644 --- a/fonts/pcf2bdf/patches/patch-ab +++ b/fonts/pcf2bdf/patches/patch-ab @@ -1,17 +1,23 @@ -$NetBSD: patch-ab,v 1.1 2004/03/09 14:47:09 agc Exp $ +$NetBSD: patch-ab,v 1.2 2004/06/15 13:35:20 grant Exp $ ---- Makefile.gcc 2004/03/09 14:42:07 1.1 -+++ Makefile.gcc 2004/03/09 14:44:16 -@@ -2,7 +2,7 @@ +--- Makefile.gcc.orig 2002-10-21 03:17:00.000000000 +1000 ++++ Makefile.gcc +@@ -1,16 +1,20 @@ + # Makefile for pcf2bdf (gcc) -*- makefile -*- - CC = gcc - CFLAGS = -Wall -O2 +-CC = gcc +-CFLAGS = -Wall -O2 -CXX = $(CC) -+CXX = g++ - CXXFLAGS = $(CFLAGS) - PREFIX = /usr/local +-CXXFLAGS = $(CFLAGS) +-PREFIX = /usr/local ++#CC = gcc ++#CFLAGS = -Wall -O2 ++#CXX = g++ ++#CXXFLAGS = $(CFLAGS) ++#PREFIX = /usr/local BINPATH = $(PREFIX)/bin -@@ -11,6 +11,10 @@ + MANPATH = $(PREFIX)/man/man1 + all: pcf2bdf pcf2bdf: pcf2bdf.o -- cgit v1.2.3