3 files changed, 27 insertions, 15 deletions
diff --git a/devel/ucpp/Makefile b/devel/ucpp/Makefile
index 74d2e945d85..a0cfc867992 100644
--- a/devel/ucpp/Makefile
+++ b/devel/ucpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/03/21 16:41:06 darcy Exp $
+# $NetBSD: Makefile,v 1.6 2009/03/26 17:14:32 joerg Exp $
 #
 
 DISTNAME=	ucpp-1.3
@@ -14,6 +14,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
+.include "../../mk/bsd.prefs.mk"
+
+CFLAGS+=	-DSTD_MACROS=NULL -DSTD_ASSERT=NULL
+MAKE_FLAGS+=	FLAGS=${CFLAGS:Q}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ucpp ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ucpp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/devel/ucpp/distinfo b/devel/ucpp/distinfo
index 2056294ea62..37d4afb3a07 100644
--- a/devel/ucpp/distinfo
+++ b/devel/ucpp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2009/03/21 16:41:06 darcy Exp $
+$NetBSD: distinfo,v 1.3 2009/03/26 17:14:32 joerg Exp $
 
 SHA1 (ucpp-1.3.tar.bz2) = 12caf535986e3919d58c47ca35ae9ed4efaa1cf0
 RMD160 (ucpp-1.3.tar.bz2) = 08f9ef1ada15c7451b7966733fb0a63bbe6b179a
 Size (ucpp-1.3.tar.bz2) = 73958 bytes
-SHA1 (patch-aa) = 9059b1f9c1ed58c99414dda920ee07b7d3c7e530
+SHA1 (patch-aa) = 120c4f63cbd44e6831c3ca8dee0bca885debd99d
diff --git a/devel/ucpp/patches/patch-aa b/devel/ucpp/patches/patch-aa
index b935c456edd..70b10af104c 100644
--- a/devel/ucpp/patches/patch-aa
+++ b/devel/ucpp/patches/patch-aa
@@ -1,22 +1,29 @@
-$NetBSD: patch-aa,v 1.2 2009/03/21 16:41:07 darcy Exp $
+$NetBSD: patch-aa,v 1.3 2009/03/26 17:14:32 joerg Exp $
 
---- Makefile.orig	2008-10-01 13:15:41.000000000 -0400
+--- Makefile.orig	2008-10-01 19:15:41.000000000 +0200
 +++ Makefile
-@@ -56,7 +56,7 @@
- #FLAGS = -O -m -DMEM_CHECK
+@@ -80,14 +80,10 @@ LIBS =
  
- # for gcc
--CC = gcc
-+CC ?= gcc
- FLAGS = -O3 -W -Wall -ansi
- #FLAGS = -g -W -Wall -ansi -DAUDIT -DMEM_DEBUG
- #FLAGS = -O3 -mcpu=pentiumpro -fomit-frame-pointer -W -Wall -ansi -DMEM_CHECK
-@@ -87,7 +87,7 @@ endif
+ #STAND_ALONE = -DSTAND_ALONE
+ 
+-ifdef STAND_ALONE
+-	FINAL_STEP = $(CC) $(LDFLAGS) -o ucpp $(COBJ) $(LIBS)
+-endif
+-
  # ----- nothing should be changed below this line -----
  
  COBJ = mem.o nhash.o cpp.o lexer.o assert.o macro.o eval.o
 -CFLAGS = $(FLAGS) $(STAND_ALONE)
-+CFLAGS += $(FLAGS) $(STAND_ALONE)
++CFLAGS = $(FLAGS) -DSTAND_ALONE
  
  all: ucpp
  	@ar cq libucpp.a *.o
+@@ -96,7 +92,7 @@ clean:
+ 	@rm -f *.o ucpp core *.a
+ 
+ ucpp: $(COBJ)
+-	@$(FINAL_STEP)
++	$(CC) $(LDFLAGS) -o ucpp $(COBJ) $(LIBS)
+ 
+ assert.o: tune.h ucppi.h cpp.h nhash.h mem.h
+ 	@$(CC) $(CFLAGS) -c assert.c