From 58db7776fd852e6c16926556bf7a79a94d898ec6 Mon Sep 17 00:00:00 2001 From: Tilman Keskinoz Date: Sun, 24 Apr 2005 15:32:39 +0000 Subject: [PATCH] Don't use autoconf213/automake14 during build --- deskutils/krss/Makefile | 14 ++++---------- deskutils/krss/files/patch-admin-acinclude.m4.in | 11 ----------- deskutils/krss/files/patch-krss-Makefile.am | 10 ---------- 3 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 deskutils/krss/files/patch-admin-acinclude.m4.in delete mode 100644 deskutils/krss/files/patch-krss-Makefile.am diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile index 88f64fde05c9..569d5d87c86e 100644 --- a/deskutils/krss/Makefile +++ b/deskutils/krss/Makefile @@ -16,23 +16,17 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= KDE Rich Site Summary viewer -WANT_AUTOMAKE_VER=14 -WANT_AUTOCONF_VER=213 USE_KDEBASE_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LIBQT="-lqt-mt" KDB2HTML=${TRUE} +USE_REINPLACE= yes QTCPPFLAGS+= ${PTHREAD_CFLAGS} QTCFGLIBS+= ${PTHREAD_LIBS} -pre-configure: - ${MKDIR} ${WRKSRC}/auto-bin - ${LN} -sf ${AUTOCONF} ${WRKSRC}/auto-bin/autoconf - ${LN} -sf ${AUTOHEADER} ${WRKSRC}/auto-bin/autoheader - ${LN} -sf ${AUTOMAKE} ${WRKSRC}/auto-bin/automake - ${LN} -sf ${ACLOCAL} ${WRKSRC}/auto-bin/aclocal - cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ - ${GMAKE} -f Makefile.dist +post-patch: + ${REINPLACE_CMD} -e 's|$$(LIB_KFILE)|-lkio|' ${WRKSRC}/krss/Makefile.in + ${REINPLACE_CMD} -e 's|-pedantic||' ${WRKSRC}/configure .include diff --git a/deskutils/krss/files/patch-admin-acinclude.m4.in b/deskutils/krss/files/patch-admin-acinclude.m4.in deleted file mode 100644 index 35ad5475f2ee..000000000000 --- a/deskutils/krss/files/patch-admin-acinclude.m4.in +++ /dev/null @@ -1,11 +0,0 @@ ---- admin/acinclude.m4.in.orig Tue Sep 11 01:23:25 2001 -+++ admin/acinclude.m4.in Sat Aug 30 04:07:57 2003 -@@ -2259,7 +2259,7 @@ - CXXFLAGS="$CXXFLAGS" - - if test true || test "$kde_use_debug_code" = "yes"; then -- CXXFLAGS="$CXXFLAGS -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings" -+ CXXFLAGS="$CXXFLAGS" - - KDE_CHECK_COMPILER_FLAG(Wno-long-long, - [ diff --git a/deskutils/krss/files/patch-krss-Makefile.am b/deskutils/krss/files/patch-krss-Makefile.am deleted file mode 100644 index 9b1cc5c70c6a..000000000000 --- a/deskutils/krss/files/patch-krss-Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - - -Sep 10 23:17 2002 diff -ruN -l0 krss/Makefile.am~ krss/Makefile.am Page 1 - - ---- krss/Makefile.am~ Tue Sep 10 23:15:10 2002 -+++ krss/Makefile.am Tue Sep 10 23:15:19 2002 -@@ -4 +4 @@ --krss_LDADD = $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -+krss_LDADD = -lkio $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)