Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Aug 2000 01:29:45 +0200 (CEST)
From:      cj@vallcom.net
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/20953: Update port: irc/bitchx
Message-ID:  <200008302329.e7UNTjs53402@214.norrgarden.se>

next in thread | raw e-mail | index | archive | help

>Number:         20953
>Category:       ports
>Synopsis:       Update port: irc/bitchx
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 30 16:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Carl Johan Madestrand
>Release:        FreeBSD 4.1-STABLE i386
>Organization:
>Environment:
>Description:
Update the port to 1.0c17 plus a few changes.
>How-To-Repeat:
>Fix:


diff -urN /usr/ports/irc/bitchx/Makefile bitchx/Makefile
--- /usr/ports/irc/bitchx/Makefile	Fri Jul  7 20:24:40 2000
+++ bitchx/Makefile	Thu Aug 31 00:48:11 2000
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	BitchX
-PORTVERSION=	1.0c16
+PORTVERSION=	1.0c17
 CATEGORIES=	irc gnome
 MASTER_SITES=	ftp://ftp.bitchx.com/pub/BitchX/source/ \
 		ftp://ftp.bitchx.org/pub/BitchX/source/ \
-		ftp://ukug.uk.freebsd.org/pub/lord_cj/
-PATCH_SITES=	ftp://ftp.bitchx.org/pub/BitchX/source/
-PATCHFILES=	1.0c16-format.patch
 
 MAINTAINER=	cj@vallcom.net
 
@@ -20,7 +17,6 @@
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
 
-PATCH_DIST_ARGS=       -d ${WRKSRC}/source --forward --quiet -E ${PATCH_DIST_STRIP}
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 WRKSRC=		${WRKDIR}/BitchX
@@ -31,8 +27,11 @@
 .else
 CONFIGURE_ARGS+=	--without-gtk
 .endif
+.if defined(WITH_ESD)
+CONFIGURE_ARGS+=	--with-gtk --enable-sound
+.endif
 .if defined(WITH_PLUGINS)
-CONFIGURE_ARGS+=	--with-plugins
+CONFIGURE_ARGS+=	--with-plugins=pkga,possum,encrypt,hint,abot,acro,amp,blowfish,scan,wavplay,qmail,fserv,nap,qbx
 .else
 CONFIGURE_ARGS+=	--without-plugins
 .endif
@@ -50,21 +49,30 @@
 
 .if !defined(WITH_GNOME)
 pre-extract:
-	@${ECHO} "You can add hooks for GNOME by defining WITH_GNOME"
-	@${ECHO} "If you want to build the plugins define WITH_PLUGINS"
+	@${ECHO} "Define WITH_GNOME if you want to build GTK BitchX"
+.endif
+.if !defined(WITH_ESD)
+	@${ECHO} "Define WITH_ESD for ESD sound support in GTK BitchX"
+.endif
+.if !defined(WITH_PLUGINS)
+	@${ECHO} "Define WITH_PLUGINS if you wish to build the plugins"
+.endif
+.if !defined(WITH_LATIN)
+	@${ECHO} "Define WITH_LATIN if you are using an ISO-8859-1 screenfont"
+.endif
+.if defined(WITH_LATIN)
+pre-patch:
+	@${PERL} -pi -e "s!#undef LATIN1!#define LATIN1!" ${WRKSRC}/include/config.h
 .endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/bx/help
 	${MKDIR} ${PREFIX}/share/doc/bitchx
-	${CP} -r ${WRKSRC}/bitchx-docs/* ${PREFIX}/share/bx/help
+	${TAR} --directory ${WRKSRC}/bitchx-docs -cf - . --exclude CVS | \
+	${TAR} --directory ${PREFIX}/share/bx/help -xf -
 	${INSTALL_DATA} ${WRKSRC}/doc/bxfaq.html ${PREFIX}/share/doc/bitchx
 .endif
-.if defined(WITH_GNOME)
-	@${ECHO} bin/gtkBitchX >> ${TMPPLIST}
-	@${ECHO} bin/gtkBitchX-1.0c16 >> ${TMPPLIST}
-	@${ECHO} share/bx/plugins/nicklist.so >> ${TMPPLIST}
+
 .if defined(WITH_PLUGINS)
 	@${ECHO} share/bx/plugins/BitchX.hints >> ${TMPPLIST}
 	@${ECHO} share/bx/plugins/acro.so >> ${TMPPLIST}
@@ -81,11 +89,14 @@
 	@${ECHO} share/bx/plugins/scan.so >> ${TMPPLIST}
 	@${ECHO} share/bx/plugins/wavplay.so >> ${TMPPLIST}
 	@${ECHO} share/bx/plugins/qbx.so >> ${TMPPLIST}
-	@${ECHO} share/bx/plugins/plugins >> ${TMPPLIST}
+	@${ECHO} @dirrm share/bx/plugins >> ${TMPPLIST}
 .endif
+.if defined(WITH_GNOME)
+	@${ECHO} bin/gtkBitchX >> ${TMPPLIST}
+	@${ECHO} bin/gtkBitchX-1.0c17 >> ${TMPPLIST}
 .else
 	@${ECHO} bin/BitchX >> ${TMPPLIST}
-	@${ECHO} bin/BitchX-1.0c16 >> ${TMPPLIST}
+	@${ECHO} bin/BitchX-1.0c17 >> ${TMPPLIST}
 	@${ECHO} bin/scr-bx >> ${TMPPLIST}
 	@${ECHO} share/bx/wserv >> ${TMPPLIST}
 .endif
diff -urN /usr/ports/irc/bitchx/files/md5 bitchx/files/md5
--- /usr/ports/irc/bitchx/files/md5	Tue Jul  4 03:30:56 2000
+++ bitchx/files/md5	Wed Aug 30 01:08:00 2000
@@ -1,2 +1 @@
-MD5 (BitchX-1.0c16.tar.gz) = 4a3749c0b2da2b157eaa13b5b8856511
-MD5 (1.0c16-format.patch) = aef06ac2c892327da6397a82b8b10b3f
+MD5 (BitchX-1.0c17.tar.gz) = 4ab094ae58f0bacb14c3e480404215fd
diff -urN /usr/ports/irc/bitchx/patches/patch-ah bitchx/patches/patch-ah
--- /usr/ports/irc/bitchx/patches/patch-ah	Sat Mar 11 16:25:39 2000
+++ bitchx/patches/patch-ah	Thu Jan  1 01:00:00 1970
@@ -1,15 +0,0 @@
---- dll/nicklist/nicklist.c.orig	Sun Jan 16 19:34:44 2000
-+++ dll/nicklist/nicklist.c	Sat Mar 11 10:19:03 2000
-@@ -43,7 +43,7 @@
- char *tmptext[1];
- #endif
- 
--BUILT_IN_DLL(nicklist_add)
-+BUILT_IN_DLL(nicklist_add);
- int update_nicklist (char *, char *, char **);
- 
- void drawnicklist(void)
-@@ -315,4 +315,4 @@
- 
- 	return 0;
- }
diff -urN /usr/ports/irc/bitchx/pkg/PLIST bitchx/pkg/PLIST
--- /usr/ports/irc/bitchx/pkg/PLIST	Fri Jul  7 20:24:43 2000
+++ bitchx/pkg/PLIST	Wed Aug 30 02:04:49 2000
@@ -598,6 +598,7 @@
 share/bx/help/5_Programming/loadtcl
 share/bx/help/5_Programming/saveirc
 share/bx/help/5_Programming/loaddll
+share/bx/help/5_Programming/fec
 share/bx/help/6_Functions/absstrlen
 share/bx/help/6_Functions/addtabkey
 share/bx/help/6_Functions/after
@@ -782,6 +783,13 @@
 share/bx/help/6_Functions/6_Functions
 share/bx/help/6_Functions/writeb
 share/bx/help/6_Functions/menucontrol
+share/bx/help/6_Functions/before
+share/bx/help/6_Functions/chr
+share/bx/help/6_Functions/getopt
+share/bx/help/6_Functions/ifindfirst
+share/bx/help/6_Functions/listarray
+share/bx/help/6_Functions/strchr
+share/bx/help/6_Functions/strrchr
 share/bx/help/7_Docs/About_BitchX
 share/bx/help/7_Docs/Arrays
 share/bx/help/7_Docs/Command_Line
@@ -898,6 +906,10 @@
 share/bx/help/8_Scripts/2.8script
 share/bx/help/8_Scripts/window
 share/bx/help/README_FIRST
+share/bx/help/commands
+share/bx/help/findcomm
+share/bx/help/functions
+share/bx/help/out
 share/bx/script/actplug.gmz
 share/bx/script/bxglobal
 share/bx/script/bxtcl.tcl
@@ -905,6 +917,7 @@
 share/bx/script/fserve+vfs.tar.gz
 share/bx/script/menu.bx
 share/bx/script/example-.bitchxrc
+share/bx/script/query.bx
 share/bx/translation/ASCII
 share/bx/translation/CP437
 share/bx/translation/CP850

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200008302329.e7UNTjs53402>