-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- fix malloc()/realloc() detection on sparc64
- don't use plugins, mechanism for loading is busted on OpenBSD - fix a typo resulting in a core dump if using "-p plugin" - bump PKGNAME plugin removal from maintainer [email protected] (Robert Nagy)
- Loading branch information
Nikolay Sturm
committed
Jul 16, 2003
1 parent
13845b0
commit 6adf327
Showing
5 changed files
with
69 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 <[email protected]> | ||
|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |