ports/62476: [PATCH] irc/irssi: Unbreak

Ulrich Spoerlein q at uni.de
Sat Feb 7 12:40:17 UTC 2004


>Number:         62476
>Category:       ports
>Synopsis:       [PATCH] irc/irssi: Unbreak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 07 04:40:16 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Ulrich Spoerlein
>Release:        FreeBSD 5.2.1-RC i386
>Organization:
>Environment:
System: FreeBSD roadrunner 5.2.1-RC FreeBSD 5.2.1-RC #6: Fri Feb  6 22:51:29 CET
>Description:
- Unbreak (not tested by me, because 5.2.1 still has EAI_NODATA. You may want
  to verify this fix on -CURRENT)
- Put USE_OPENSSL before <bsd.port.pre.mk>
- make configure happy
- make pre-configure target non-fatal. This makes interrupting and resuming
  the configure stage possible.

New file: files/patch-eai_nodata

I send a patch to ports@ for unifying these WITH{,_OUT}_foo={yes,no,1} once,
but response to it was rather lacking...

Port maintainer (vanilla at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
Note to maintainer: The WITH_foo logic in this port is flawed. Checking for
WITH_foo=yes is not very robust because people may run with -DWITH_foo.
Therefore it's better to check for WITH_foo=no or defined(WITHOUT_foo).
Try 'make -DWITH_IPV6', it will result in IPv6 support being _disabled_
>Fix:

--- irssi-0.8.9_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/irc/irssi/Makefile,v
retrieving revision 1.78
diff -u -u -r1.78 Makefile
--- Makefile	7 Feb 2004 06:38:29 -0000	1.78
+++ Makefile	7 Feb 2004 12:28:50 -0000
@@ -18,16 +18,23 @@
 GNU_CONFIGURE=	yes
 
 WANT_GNOME=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		irssi.1
 
-.include <bsd.port.pre.mk>
+# Set option defaults.
+
+.if ! defined(WITH_SSL)
+WITH_SSL=	yes
+.endif
 
-.if ${OSVERSION} >= 502000
-BROKEN=		"Does not compile"
+.if ${WITH_SSL:L} == "no"
+CONFIGURE_ARGS+=       --disable-ssl
+.else
+USE_OPENSSL=   yes
 .endif
 
-# Set option defaults.
+.include <bsd.port.pre.mk>
 
 .if ! defined(WITH_GLIB)
 .if exists(${LOCALBASE}/include/glib-2.0/glib.h)
@@ -53,10 +60,6 @@
 WITH_IPV6=	yes
 .endif
 
-.if ! defined(WITH_SSL)
-WITH_SSL=	yes
-.endif
-
 .if ! defined(WITH_BOEHM_GC)
 WITH_BOEHM_GC=	no
 .endif
@@ -105,12 +108,6 @@
 .endif
 .endif
 
-.if ${WITH_SSL:L} == "yes"
-USE_OPENSSL=	yes
-.else
-CONFIGURE_ARGS+=	--disable-ssl
-.endif
-
 .if ${WITH_BOEHM_GC:L} == "yes"
 LIB_DEPENDS+=	gc.1:${PORTSDIR}/devel/boehm-gc
 CONFIGURE_ENV+=	CPPFLAGS=-I${PREFIX}/include
@@ -136,7 +133,7 @@
 	@${ECHO} ""
 
 pre-configure:
-	@cd ${WRKSRC} && ${MV} irssi.conf irssi.conf.sample
+	@cd ${WRKSRC} && ${MV} irssi.conf irssi.conf.sample || ${TRUE}
 
 post-install:
 	@if [ ! -f ${LOCALBASE}/etc/irssi.conf ]; then \
--- irssi-0.8.9_1.patch ends here ---

--- /dev/null	Sat Feb  7 12:51:32 2004
+++ files/patch-eai_nodata	Sat Feb  7 12:50:23 2004
@@ -0,0 +1,11 @@
+--- src/core/network.c.orig	Sat Feb  7 12:48:34 2004
++++ src/core/network.c	Sat Feb  7 12:49:40 2004
+@@ -607,7 +607,7 @@
+ int net_hosterror_notfound(int error)
+ {
+ #ifdef HAVE_IPV6
+-	return error != 1 && (error == EAI_NONAME || error == EAI_NODATA);
++	return error != 1 && (error == EAI_NONAME);
+ #else
+ 	return error == HOST_NOT_FOUND || error == NO_ADDRESS;
+ #endif
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list