svn commit: r318233 - in head/irc: eggdrop eggdrop-devel eggdrop-devel/files

[Pietro Cerutti]

Author: gahr
Date: Wed May 15 09:42:00 2013
New Revision: 318233
URL: http://svnweb.freebsd.org/changeset/ports/318233

Log:
  - Fix build with Tcl/Tk 8.6
  
  Reported by:	miwi (Tcl/Tk 86 exp-run)
  Approved by:	portmgr

Added:
  head/irc/eggdrop-devel/files/patch-src-match.c   (contents, props changed)
  head/irc/eggdrop-devel/files/patch-src-net.c   (contents, props changed)
  head/irc/eggdrop-devel/files/patch-src-tclhash.c   (contents, props changed)
Modified:
  head/irc/eggdrop-devel/Makefile   (contents, props changed)
  head/irc/eggdrop/Makefile

Modified: head/irc/eggdrop-devel/Makefile
==============================================================================
--- head/irc/eggdrop-devel/Makefile	Wed May 15 08:43:42 2013	(r318232)
+++ head/irc/eggdrop-devel/Makefile	Wed May 15 09:42:00 2013	(r318233)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	eggdrop-devel
-# Date created:				June 13, 2011
-# Whom:						Beech Rintoul <beech at FreeBSD.org>
-#
+# Created by: Beech Rintoul <beech at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	eggdrop
@@ -20,6 +17,8 @@ LICENSE=	GPLv2
 
 USE_TCL=	85+
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_VER:S/.//}.so \
+		--with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -112,7 +111,7 @@ do-install:
 	@${MKDIR} ${DOCSDIR}/html
 	cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${DOCSDIR}/html
 	@${MKDIR} ${DOCSDIR}/settings
-	cd ${WRKSRC}/doc/settings && $(RM) -rf CVS \
+	cd ${WRKSRC}/doc/settings && ${RM} -rf CVS \
 		&& ${INSTALL_DATA} * ${DOCSDIR}/settings
 .endif
 	@${CAT} ${PKGMESSAGE}

Added: head/irc/eggdrop-devel/files/patch-src-match.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/eggdrop-devel/files/patch-src-match.c	Wed May 15 09:42:00 2013	(r318233)
@@ -0,0 +1,11 @@
+--- src/match.c.orig	2013-05-13 15:17:47.000000000 +0200
++++ src/match.c	2013-05-13 15:17:24.000000000 +0200
+@@ -367,7 +367,7 @@
+ /* Inline for cron_match (obviously).
+  * Matches a single field of a crontab expression.
+  */
+-inline int cron_matchfld(char *mask, int match)
++int cron_matchfld(char *mask, int match)
+ {
+   int skip = 0, f, t;
+   char *p, *q;

Added: head/irc/eggdrop-devel/files/patch-src-net.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/eggdrop-devel/files/patch-src-net.c	Wed May 15 09:42:00 2013	(r318233)
@@ -0,0 +1,11 @@
+--- src/net.c.orig	2013-05-13 15:18:26.000000000 +0200
++++ src/net.c	2013-05-13 15:18:34.000000000 +0200
+@@ -560,7 +560,7 @@
+ /* Returns a socket number for a listening socket that will accept any
+  * connection -- port # is returned in port
+  */
+-inline int open_listen(int *port)
++int open_listen(int *port)
+ {
+   int sock;
+   sockname_t name;

Added: head/irc/eggdrop-devel/files/patch-src-tclhash.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/eggdrop-devel/files/patch-src-tclhash.c	Wed May 15 09:42:00 2013	(r318233)
@@ -0,0 +1,11 @@
+--- src/tclhash.c.orig	2013-05-13 15:18:05.000000000 +0200
++++ src/tclhash.c	2013-05-13 15:18:12.000000000 +0200
+@@ -113,7 +113,7 @@
+   nfree(tl);
+ }
+ 
+-inline void garbage_collect_tclhash(void)
++void garbage_collect_tclhash(void)
+ {
+   tcl_bind_list_t *tl, *tl_next, *tl_prev;
+   tcl_bind_mask_t *tm, *tm_next, *tm_prev;

Modified: head/irc/eggdrop/Makefile
==============================================================================
--- head/irc/eggdrop/Makefile	Wed May 15 08:43:42 2013	(r318232)
+++ head/irc/eggdrop/Makefile	Wed May 15 09:42:00 2013	(r318233)
@@ -16,6 +16,8 @@ LICENSE=        GPLv2
 
 USE_TCL=	85+
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_VER:S/.//}.so \
+		--with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		eggdrop.1