diff --git a/misc/ccze/Makefile b/misc/ccze/Makefile
index 1856c5fc1c..133738b3e8 100644
--- a/misc/ccze/Makefile
+++ b/misc/ccze/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/07/05 18:58:35 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2003/07/16 09:40:29 sturm Exp $
 
 COMMENT=	"log colorizer"
 
 DISTNAME=	ccze-0.2.1	
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	misc
 
 MAINTAINER=	Robert Nagy <thuglife@bsd.hu>
@@ -17,10 +18,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+.if ${MACHINE_ARCH} == "sparc64"
+PATCH_LIST=	patch-* gcc-*
+.endif
+
 LIB_DEPENDS=	pcreposix,pcre::devel/pcre
 
 USE_GMAKE=	Yes
 
 CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=	--with-builtins=all
 
 .include <bsd.port.mk>
diff --git a/misc/ccze/patches/gcc-configure b/misc/ccze/patches/gcc-configure
new file mode 100644
index 0000000000..d927029033
--- /dev/null
+++ b/misc/ccze/patches/gcc-configure
@@ -0,0 +1,37 @@
+$OpenBSD: gcc-configure,v 1.1 2003/07/16 09:40:29 sturm Exp $
+--- configure.orig	Tue May 13 20:09:47 2003
++++ configure	Wed Jul 16 10:40:30 2003
+@@ -3794,6 +3794,8 @@ fi
+ 
+ done
+ 
++_SAVE_CFLAGS=$CFLAGS
++CFLAGS=-O0
+ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
+ echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6
+ if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
+@@ -3866,6 +3868,7 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+ 
+ fi
++CFLAGS=$_SAVE_CFLAGS
+ 
+ 
+ 
+@@ -4011,6 +4014,8 @@ fi
+ 
+ done
+ 
++_SAVE_CFLAGS=$CFLAGS
++CFLAGS=-O0
+ echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5
+ echo $ECHO_N "checking for GNU libc compatible realloc... $ECHO_C" >&6
+ if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then
+@@ -4083,6 +4088,7 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+ 
+ fi
++CFLAGS=$_SAVE_CFLAGS
+ 
+ 
+ 
diff --git a/misc/ccze/patches/patch-src_ccze-compat_c b/misc/ccze/patches/patch-src_ccze-compat_c
new file mode 100644
index 0000000000..5da1519c6f
--- /dev/null
+++ b/misc/ccze/patches/patch-src_ccze-compat_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_ccze-compat_c,v 1.1 2003/07/16 09:40:29 sturm Exp $
+--- src/ccze-compat.c.orig	Wed Jul 16 11:18:56 2003
++++ src/ccze-compat.c	Wed Jul 16 11:19:07 2003
+@@ -275,7 +275,7 @@ ccze_getsubopt (char **optionp, char *co
+ 		char **valuep)
+ {
+   int i = getsubopt (optionp, tokens, valuep);
+-#if HAVE_SUBOPTARg
++#if HAVE_SUBOPTARG
+   if (!*valuep && suboptarg)
+     *valuep = strdup (suboptarg);
+ #endif
diff --git a/misc/ccze/patches/patch-src_ccze-plugin_c b/misc/ccze/patches/patch-src_ccze-plugin_c
new file mode 100644
index 0000000000..f85eca5261
--- /dev/null
+++ b/misc/ccze/patches/patch-src_ccze-plugin_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_ccze-plugin_c,v 1.1 2003/07/16 09:40:29 sturm Exp $
+--- src/ccze-plugin.c.orig	Tue May 13 20:09:08 2003
++++ src/ccze-plugin.c	Wed Jul 16 11:18:38 2003
+@@ -208,7 +208,7 @@ ccze_plugin_load (const char *name)
+ }
+ 
+ static int
+-_ccze_plugin_select (const struct dirent *de)
++_ccze_plugin_select (struct dirent *de)
+ {
+   if (strstr (de->d_name, ".so"))
+     return 1;
diff --git a/misc/ccze/pkg/PLIST b/misc/ccze/pkg/PLIST
index dc85b7e91a..73a06698ee 100644
--- a/misc/ccze/pkg/PLIST
+++ b/misc/ccze/pkg/PLIST
@@ -1,27 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/07/05 18:58:35 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2003/07/16 09:40:29 sturm Exp $
 bin/ccze
 bin/ccze-cssdump
-include/ccze.h
-lib/ccze/apm.so
-lib/ccze/distcc.so
-lib/ccze/exim.so
-lib/ccze/fetchmail.so
-lib/ccze/ftpstats.so
-lib/ccze/httpd.so
-lib/ccze/icecast.so
-lib/ccze/oops.so
-lib/ccze/php.so
-lib/ccze/postfix.so
-lib/ccze/procmail.so
-lib/ccze/proftpd.so
-lib/ccze/squid.so
-lib/ccze/sulog.so
-lib/ccze/super.so
-lib/ccze/syslog.so
-lib/ccze/ulogd.so
-lib/ccze/vsftpd.so
-lib/ccze/xferlog.so
 man/man1/ccze.1
 man/man1/ccze-cssdump.1
-man/man7/ccze-plugin.7
-@dirrm lib/ccze