Date: Mon, 12 Nov 2007 15:33:42 +0100 From: "\"Pietro Cerutti\" <Pietro Cerutti" <gahr@gahr.ch> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/118004: [patch] net-im/gtkyahoo unbreak fix plist error Message-ID: <1194878022.46703@gahrtop.localhost> Resent-Message-ID: <200711121440.lACEe0hP004188@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118004
>Category: ports
>Synopsis: [patch] net-im/gtkyahoo unbreak fix plist error
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 12 14:40:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Pietro Cerutti
>Release: FreeBSD 8.0-CURRENT i386
>Organization:
Bern University of Applied Sciences
>Environment:
System: FreeBSD 8.0-CURRENT #9: Fri Nov 9 14:50:37 CET 2007
root@gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034
>Description:
gtkyahoo incorrectly specifies a file in pkg-plist which doesn't get installed, causing make package to fail on "file not found".
- fixed pkg-plist
- fixed a few warnings
>How-To-Repeat:
cd /usr/ports/net-im/gtkyahoo && make package
>Fix:
--- _gtkyahoo.diff begins here ---
--- Makefile.orig 2007-11-12 15:04:18.000000000 +0100
+++ Makefile 2007-11-12 15:04:31.000000000 +0100
@@ -22,14 +22,8 @@
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
-.endif
-
post-patch:
@${REINPLACE_CMD} -e '/@INSTALL@/s/$$INSTALL/${INSTALL}/' \
${WRKSRC}/libyahoo/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- /dev/null 2007-11-12 15:22:40.000000000 +0100
+++ files/patch-gtkyahoo.c 2007-11-12 15:21:42.000000000 +0100
@@ -0,0 +1,10 @@
+--- gtkyahoo.c.orig 2007-11-12 15:21:19.000000000 +0100
++++ gtkyahoo.c 2007-11-12 15:21:22.000000000 +0100
+@@ -1456,6 +1456,7 @@
+ int setgeom = 0;
+ int curarg = 1;
+ GtkAllocation initial_geometry;
++ initial_geometry.x = initial_geometry.y = initial_geometry.width = initial_geometry.height = 0;
+
+ DBG_Open(NULL);
+
--- /dev/null 2007-11-12 15:22:40.000000000 +0100
+++ files/patch-libyahoo_libyahoo.c 2007-11-12 15:13:59.000000000 +0100
@@ -0,0 +1,30 @@
+--- libyahoo/libyahoo.c.orig 2007-11-12 15:12:19.000000000 +0100
++++ libyahoo/libyahoo.c 2007-11-12 15:13:33.000000000 +0100
+@@ -746,15 +746,15 @@
+ static char *yahoo_urlencode(const char *instr)
+ {
+ register int ipos, bpos; //input str pos., buffer pos.
+- static unsigned char *str = NULL;
++ static char *str = NULL;
+ int len = strlen(instr);
+ int tmp;
+
+ //attempt to reuse buffer
+ if (NULL == str)
+- str = (unsigned char *) malloc(3 * len + 1);
++ str = malloc(3 * len + 1);
+ else
+- str = (unsigned char *) realloc(str, 3 * len + 1);
++ str = realloc(str, 3 * len + 1);
+
+ //malloc, realloc failed ?
+ if (errno == ENOMEM)
+@@ -791,7 +791,7 @@
+
+ //free extra alloc'ed mem.
+ tmp = strlen(str);
+- str = (unsigned char *) realloc(str, tmp + 1);
++ str = realloc(str, tmp + 1);
+
+ return (str);
+ }
--- pkg-plist.orig 2007-11-12 15:30:50.000000000 +0100
+++ pkg-plist 2007-11-12 15:30:59.000000000 +0100
@@ -4,8 +4,7 @@
include/libyahoo/libyahoo-debug.h
include/libyahoo/libyahoo-proto.h
lib/libyahoo.a
-lib/libyahoo.so
-lib/libyahoo.so.0
+lib/libyahoo.so.0.0
lib/libyahoo.la
libexec/gtkyahoo-sound-handler
%%DATADIR%%/sample.gtkyahoorc
--- _gtkyahoo.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?1194878022.46703>