Date: Sat, 18 Oct 2003 16:50:44 +0000 (GMT) From: Markus Brueffer <brueffer@phoenix-systems.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: erich@tacni.net Subject: ports/58226: [patch] ftp/kwebget: unbreak on 5.x Message-ID: <20031018165044.4C5D41D@haakonia.hitnet.rwth-aachen.de> Resent-Message-ID: <200310181700.h9IH0dOW094418@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58226
>Category: ports
>Synopsis: [patch] ftp/kwebget: unbreak on 5.x
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 18 10:00:39 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Markus Brueffer
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD cheops.phoenix 5.1-CURRENT FreeBSD 5.1-CURRENT #9: Mon Oct 13 14:46:55 CEST 2003 brueffer@cheops.phoenix:/usr/obj/usr/src/sys/CHEOPS i386
>Description:
Changes to ftp/kwebget:
- unbreak on 5.x
- respect PTHREAD_LIBS and CFLAGS
- use REINPLACE_CMD instead of PERL
- remove obsolete replacement
Reported by: kris via bento
Maintainer CC'ed
>How-To-Repeat:
>Fix:
--- kwebget.diff begins here ---
diff -ruN kwebget.orig/Makefile kwebget/Makefile
--- kwebget.orig/Makefile Sat Oct 18 18:14:19 2003
+++ kwebget/Makefile Sat Oct 18 18:34:10 2003
@@ -21,16 +21,12 @@
USE_GMAKE= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-CONFIGURE_TARGET= # empty
-CONFIGURE_ARGS+= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_REINPLACE= yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN= "Does not compile (bad C++ code)"
-.endif
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
post-patch:
- @${PERL} -pi -e 's#lqt#lqt2#g' ${WRKSRC}/configure ${WRKSRC}/kwebget/Makefile.in
+ @${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \
+ ${WRKSRC}/${CONFIGURE_SCRIPT}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN kwebget.orig/files/patch-kwebget.cpp kwebget/files/patch-kwebget.cpp
--- kwebget.orig/files/patch-kwebget.cpp Thu Jan 1 01:00:00 1970
+++ kwebget/files/patch-kwebget.cpp Sat Oct 18 18:27:50 2003
@@ -0,0 +1,11 @@
+--- kwebget/kwebget.cpp.orig Sat Oct 18 18:26:29 2003
++++ kwebget/kwebget.cpp Sat Oct 18 18:26:50 2003
+@@ -15,6 +15,8 @@
+ * *
+ ***************************************************************************/
+
++#include <stdlib.h>
++
+ #include "kwebget.h"
+
+ #include "../pics/bg.xpm"
--- kwebget.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031018165044.4C5D41D>