From 8541d9ee32f2aa5c74bb1aa08967d20298ca56a8 Mon Sep 17 00:00:00 2001 From: Volker Stolz Date: Mon, 20 Dec 2004 12:44:27 +0000 Subject: [PATCH] - Fix build on 4.X - Respect CFLAGS etc. (me) PR: ports/75169 Submitted by: maintainer --- net-im/kf/Makefile | 3 --- net-im/kf/files/patch-src-Makefile.in | 13 +++++++++++++ net-im/kf/files/patch-src-emoticons.c | 13 +++++++++++++ net/kf/Makefile | 3 --- net/kf/files/patch-src-Makefile.in | 13 +++++++++++++ net/kf/files/patch-src-emoticons.c | 13 +++++++++++++ 6 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 net-im/kf/files/patch-src-Makefile.in create mode 100644 net-im/kf/files/patch-src-emoticons.c create mode 100644 net/kf/files/patch-src-Makefile.in create mode 100644 net/kf/files/patch-src-emoticons.c diff --git a/net-im/kf/Makefile b/net-im/kf/Makefile index 9f06c30d608d..5a46bc4fe787 100644 --- a/net-im/kf/Makefile +++ b/net-im/kf/Makefile @@ -22,9 +22,6 @@ USE_GETOPT_LONG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER= 15 -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - .ifndef(WITHOUT_GTKSPELL) LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell2 CONFIGURE_ARGS+= --enable-gtkspell diff --git a/net-im/kf/files/patch-src-Makefile.in b/net-im/kf/files/patch-src-Makefile.in new file mode 100644 index 000000000000..9ba28d91cc16 --- /dev/null +++ b/net-im/kf/files/patch-src-Makefile.in @@ -0,0 +1,13 @@ +--- src/Makefile.in.orig Mon Dec 20 13:36:48 2004 ++++ src/Makefile.in Mon Dec 20 13:37:29 2004 +@@ -90,8 +90,8 @@ + + + #kf_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) +-CFLAGS = -Wall -Wmissing-declarations +-LDFLAGS = -g ++CFLAGS = @CFLAGS@ -Wall -Wmissing-declarations ++LDFLAGS = @LDFLAGS@ -g + kf_LDADD = @PACKAGE_LIBS@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h diff --git a/net-im/kf/files/patch-src-emoticons.c b/net-im/kf/files/patch-src-emoticons.c new file mode 100644 index 000000000000..5e3a66248883 --- /dev/null +++ b/net-im/kf/files/patch-src-emoticons.c @@ -0,0 +1,13 @@ +--- src/emoticons.c.orig Thu Dec 16 22:50:31 2004 ++++ src/emoticons.c Thu Dec 16 22:51:27 2004 +@@ -347,9 +347,9 @@ + gchar *caption; /* Should be enough... */ + + if (kf_preferences_get_int ("chatShowStamps")) { ++ gchar *sstamp; + struct tm *stime; + stime = localtime ((time_t *) &stamp); +- gchar *sstamp; + + gtk_text_buffer_get_end_iter (buffer, &iter); + if (stamp < time (NULL) - 3600 * 24) { diff --git a/net/kf/Makefile b/net/kf/Makefile index 9f06c30d608d..5a46bc4fe787 100644 --- a/net/kf/Makefile +++ b/net/kf/Makefile @@ -22,9 +22,6 @@ USE_GETOPT_LONG= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_LIBTOOL_VER= 15 -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - .ifndef(WITHOUT_GTKSPELL) LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell2 CONFIGURE_ARGS+= --enable-gtkspell diff --git a/net/kf/files/patch-src-Makefile.in b/net/kf/files/patch-src-Makefile.in new file mode 100644 index 000000000000..9ba28d91cc16 --- /dev/null +++ b/net/kf/files/patch-src-Makefile.in @@ -0,0 +1,13 @@ +--- src/Makefile.in.orig Mon Dec 20 13:36:48 2004 ++++ src/Makefile.in Mon Dec 20 13:37:29 2004 +@@ -90,8 +90,8 @@ + + + #kf_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) +-CFLAGS = -Wall -Wmissing-declarations +-LDFLAGS = -g ++CFLAGS = @CFLAGS@ -Wall -Wmissing-declarations ++LDFLAGS = @LDFLAGS@ -g + kf_LDADD = @PACKAGE_LIBS@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h diff --git a/net/kf/files/patch-src-emoticons.c b/net/kf/files/patch-src-emoticons.c new file mode 100644 index 000000000000..5e3a66248883 --- /dev/null +++ b/net/kf/files/patch-src-emoticons.c @@ -0,0 +1,13 @@ +--- src/emoticons.c.orig Thu Dec 16 22:50:31 2004 ++++ src/emoticons.c Thu Dec 16 22:51:27 2004 +@@ -347,9 +347,9 @@ + gchar *caption; /* Should be enough... */ + + if (kf_preferences_get_int ("chatShowStamps")) { ++ gchar *sstamp; + struct tm *stime; + stime = localtime ((time_t *) &stamp); +- gchar *sstamp; + + gtk_text_buffer_get_end_iter (buffer, &iter); + if (stamp < time (NULL) - 3600 * 24) {