Date: Wed, 2 May 2007 21:01:14 -0800 From: "Beech Rintoul" <beech@alaskaparadise.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: infofarmer@FreeBSD.org Subject: ports/112378: [CHANGE REQUEST] irc/bitchx - Various fixes - Take Maintainership Message-ID: <1178168474.59455@stargate.alaskaparadise.com> Resent-Message-ID: <200705030510.l435A5X7070654@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112378
>Category: ports
>Synopsis: [CHANGE REQUEST] irc/bitchx - Various fixes - Take Maintainership
>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: Thu May 03 05:10:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Beech Rintoul
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
Alaska Paradise
>Environment:
System: FreeBSD 7.0-CURRENT #118: Sun Apr 29 02:46:13 AKDT 2007
root@stargate.alaskaparadise.com:/usr/obj/usr/src/sys/STARGATE
>Description:
* Fixed options
* Removed 4.x only option (tcl)
* Take maintainership
>How-To-Repeat:
>Fix:
diff -ruN --exclude=CVS /usr/ports/irc/bitchx.orig/Makefile /usr/ports/irc/bitchx/Makefile
--- /usr/ports/irc/bitchx.orig/Makefile Sun Mar 4 15:15:24 2007
+++ /usr/ports/irc/bitchx/Makefile Wed May 2 20:20:37 2007
@@ -7,21 +7,21 @@
PORTNAME= BitchX
PORTVERSION= 1.1
-CATEGORIES+= irc
-MASTER_SITES= ftp://ftp.bitchx.org/pub/BitchX/source/ \
- ftp://ftp.cyberpunkz.org/pub/BitchX/source/ \
- ftp://ftp.cyberpunkz.org/pub/BitchX/tcl-o/:tcl
-DISTFILES= ircii-pana-${PORTVERSION}-final${EXTRACT_SUFX}
-EXTRACT_ONLY= ircii-pana-${PORTVERSION}-final${EXTRACT_SUFX}
+PORTREVISION= 1
+CATEGORIES+= irc gnome
+MASTER_SITES= ftp://ftp.bitchx.org/pub/BitchX/ \
+ ftp://ftp.cyberpunkz.org/pub/BitchX/
+DISTNAME= ircii-pana-${PORTVERSION}-final
-MAINTAINER?= ports@FreeBSD.org
-COMMENT?= An alternative ircII color client with optional GTK/GNOME support
+MAINTAINER?= beech@alaskaparadise.com
+COMMENT?= ircII color client with GTK/GNOME support
WRKSRC= ${WRKDIR}/BitchX
USE_PERL5= yes
GNU_CONFIGURE= yes
WANT_GNOME= yes
USE_GMAKE= yes
+USE_X_PREFIX= yes
CONFIGURE_TARGET=
CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
--bindir="${PREFIX}/bin" \
@@ -33,18 +33,22 @@
MAN1= BitchX.1
-#OPTIONS= ESOND "With ESOUND support" off \
-# GNOME "With GTK/GNOME1 Frontend" off \
-# IPV6 "With IPV6 support" off \
-# LATIN "Recommended if you are using an ISO-8859-1 display" off \
-# PLUGINS "With BitchX Plugins" off \
-# SOCKS5 "With SOCKS5 support" off \
-# SSL "With SSL" off \
-# TCL "With TCL support" off \
-# XMMS "With XMMS plugin" off
+OPTIONS= ESOND "With ESOUND support" off \
+ GNOME "With GTK/GNOME1 Frontend" off \
+ IPV6 "With IPV6 support" off \
+ LATIN "Recommended if you are using an ISO-8859-1 display" off \
+ PLUGINS "With BitchX Plugins" off \
+ SOCKS5 "With SOCKS5 support" off \
+ SSL "With SSL" off \
+ XMMS "With XMMS plugin" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SSL)
+CONFIGURE_ARGS+=--with-ssl
+.endif
.if defined(WITH_GNOME)
-USE_X_PREFIX= yes
USE_GNOME= gnomelibs
CONFIGURE_ARGS+=--with-gtk
CFLAGS+= -I${X11BASE}/include/gnome-1.0/
@@ -53,21 +57,12 @@
CONFIGURE_ARGS+=--without-gtk
PLIST_SUB+= GNOME:="@comment " NOGNOME:=""
.endif
+
.if (defined(WITH_ESOUND) && defined(WITH_GNOME))
USE_GNOME+= esound
CONFIGURE_ARGS+=--enable-sound
.endif
-.if defined(WITH_SSL)
-USE_OPENSSL= yes
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_TCL)
-DISTFILES+= freebsd4-tcl83-bx1.0c19-tcl.o:tcl
-.endif
-
.if defined(WITH_XMMS)
LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
.endif
@@ -80,18 +75,6 @@
CONFIGURE_ARGS+=--enable-ipv6
.endif
-.if defined(WITH_TCL)
-BUILD_DEPENDS+= ${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83
-CONFIGURE_ARGS+=--with-tcl \
- --with-tcl-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3"
-CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3
-ONLY_FOR_ARCHS= i386
-.if ${OSVERSION} > 500017
-BROKEN= "WITH_TCL is not available on 5.X, try to install without TCL"
-.endif
-.endif
-
.if defined(WITH_SOCKS5)
BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
CONFIGURE_ARGS+= --with-socks5=${LOCALBASE}
@@ -121,57 +104,10 @@
.endif
.if (defined(WITH_PLUGINS) || defined(WITH_XMMS))
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_ARGS+= --with-plugins=${PLUGINS}
.endif
CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
-
-.if defined(WITH_TCL)
-
-pre-fetch:
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
- ${DIALOG} --yesno "SECURITY NOTICE: TCL support is only \
- available by linking a precompiled binary object into the Application. \
- Do you really want to proceed building BitchX with TCL support?" 7 70 || ${FALSE}
-.endif # BATCH
-
-.endif # WITH_TCL
-
-pre-extract:
- @${ECHO_CMD} "Available switches:"
- @${ECHO_CMD} "-------------------"
-.if !defined (WITH_XMMS)
- @${ECHO_CMD} "WITH_XMMS - Building BitchX with XMMS-Plugin"
-.endif
-.if !defined(WITH_PLUGINS)
- @${ECHO_CMD} "WITH_PLUGINS - Building BitchX with some other plugins"
-.endif
-.if !defined(WITH_LATIN)
- @${ECHO_CMD} "WITH_LATIN - Recommended if you are using an ISO-8859-1 display"
-.endif
-.if !defined(WITH_TCL)
- @${ECHO_CMD} "WITH_TCL - Build BitchX with TCL scripting"
-.endif
-.if !defined(WITH_SOCKS5)
- @${ECHO_CMD} "WITH_SOCKS5 - Build BitchX with SOCKS5 support"
-.endif
-.if !defined(WITH_SSL)
- @${ECHO_CMD} "WITH_SSL - Build BitchX with SSL support"
-.endif
-.if !defined(WITH_IPV6)
- @${ECHO_CMD} "WITH_IPV6 - Build BitchX with IPV6 support"
- @${ECHO_CMD} " (Please Note: /detach crashes BitchX with IPv6)"
-.endif
-.if !defined(WITH_GNOME)
- @${ECHO_CMD} "WITH_GNOME - Build BitchX with Gtk-Frontend"
-.endif
-
-.if defined(WITH_TCL)
-
-post-extract:
- @${CP} ${DISTDIR}/freebsd4-tcl83-bx1.0c19-tcl.o ${WRKSRC}/source/tcl.o
-
-.endif
pre-patch:
.if defined(WITH_LATIN)
diff -ruN --exclude=CVS /usr/ports/irc/bitchx.orig/distinfo /usr/ports/irc/bitchx/distinfo
--- /usr/ports/irc/bitchx.orig/distinfo Mon Jan 30 01:33:46 2006
+++ /usr/ports/irc/bitchx/distinfo Wed May 2 19:28:39 2007
@@ -1,5 +1,3 @@
MD5 (ircii-pana-1.1-final.tar.gz) = 611d2dda222f00c10140236f4c331572
SHA256 (ircii-pana-1.1-final.tar.gz) = 7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57
SIZE (ircii-pana-1.1-final.tar.gz) = 2532476
-MD5 (freebsd4-tcl83-bx1.0c19-tcl.o) = a49fd4cab976de64ea8b4215a50a9553
-SIZE (freebsd4-tcl83-bx1.0c19-tcl.o) = 46620
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1178168474.59455>