Subject: pkg/19869: chat/eggdrop update (1.6.13)
To: None <gnats-bugs@gnats.netbsd.org>
From: None <svs+pr@grep.ru>
List: netbsd-bugs
Date: 01/15/2003 17:35:38
>Number:         19869
>Category:       pkg
>Synopsis:       chat/eggdrop update (1.6.13)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 15 17:36:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Svishchev
>Release:        
>Organization:
>Environment:
>Description:
There were three new releases of eggdrop, current one is 1.6.13.

>How-To-Repeat:

>Fix:
Index: chat/eggdrop/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/eggdrop/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- chat/eggdrop/Makefile	2002/09/25 18:32:10	1.3
+++ chat/eggdrop/Makefile	2003/01/16 01:14:06
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.3 2002/09/25 18:32:10 wiz Exp $
 #
 
-DISTNAME=	eggdrop1.6.10
-PKGNAME=	eggdrop-1.6.10
-PKGREVISION=	1
+DISTNAME=	eggdrop1.6.13
+PKGNAME=	eggdrop-1.6.13
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
 
@@ -11,14 +10,15 @@
 HOMEPAGE=	http://www.eggheads.org/
 COMMENT=	IRC robot with TCL scripting and multi-channel ability
 
-DEPENDS+=	tcl>=8.3.2:../../lang/tcl
-
+USE_BUILDLINK2=	YES
+BUILDLINK_DEPENDS.tcl?=   tcl>=8.3.2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"
+MAKE_ENV+= _OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME}
 
 post-patch:
 	cd ${WRKSRC} && ${SED} -e 's,modules/,${PREFIX}/lib/eggdrop/,' \
-		< eggdrop.complete.conf > eggdrop.conf.dist.new
+		< eggdrop.conf > eggdrop.conf.dist.new
 
 post-configure:
 	cd ${WRKSRC} && ${MAKE} config
@@ -46,6 +46,7 @@
 		klined.tcl notes2.tcl ques5.tcl sentinel.tcl userinfo.tcl weed \
 		${PREFIX}/share/eggdrop/scripts/
 
+.include "../../lang/tcl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if defined(NOPIC)
Index: chat/eggdrop/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/chat/eggdrop/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- chat/eggdrop/distinfo	2002/09/25 18:32:10	1.2
+++ chat/eggdrop/distinfo	2003/01/16 01:14:06
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.2 2002/09/25 18:32:10 wiz Exp $
 
-SHA1 (eggdrop1.6.10.tar.gz) = 11586588909d2e7aa4193a4f921ef42183e2fce2
-Size (eggdrop1.6.10.tar.gz) = 893527 bytes
-SHA1 (patch-aa) = 694daa9778be7298cf11b6b718767eaf9d10c8ce
+SHA1 (eggdrop1.6.13.tar.gz) = f20998dc46db0edcab9a28a20238a3dd0c390aa6
+Size (eggdrop1.6.13.tar.gz) = 935160 bytes
+SHA1 (patch-aa) = 25f5b1202a8eee7cd04c5830256f280eec6fbb1e
 SHA1 (patch-ab) = 4d27ee6281f85b20f4d171e9a9fdf680c5dce211
 SHA1 (patch-ac) = 8fa1a3f239f63f59095964d4753e63efd6fcbc4c
 SHA1 (patch-ad) = 8b9f740e82d44df7daeede770fce7f5add751407
 SHA1 (patch-ae) = 8676f61d7cee954a4c5446ace528f1e3292a8cc0
-SHA1 (patch-ag) = 6e42d23a3c0fec35e01aecf8a31ebe58996c5327
+SHA1 (patch-ag) = b8401e66d1e268a7e353b9be29cd49c862cb2d32
 SHA1 (patch-ah) = b9f6e10f0a1a8f73f014ceae5015dc157f8fe124
 SHA1 (patch-ai) = fa86f94b90ba474fdefbdc98ec5a7bd4d3971b3d
 SHA1 (patch-aj) = aa68629454ec74fdb7bd63f61bed133686ca794d
Index: chat/eggdrop/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/chat/eggdrop/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- chat/eggdrop/patches/patch-aa	2002/06/26 03:48:13	1.1.1.1
+++ chat/eggdrop/patches/patch-aa	2003/01/16 01:14:06
@@ -14,6 +14,6 @@
 +	SHLIB_LD="ld -Bshareable -x"
 +	BEL_MOD_LD="$CC $LDFLAGS"
 +    fi
-     cat >>confdefs.h <<\EOF
+     cat >>confdefs.h <<\_ACEOF
  #define MODULES_OK 1
- EOF
+ _ACEOF
Index: chat/eggdrop/patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/chat/eggdrop/patches/patch-ag,v
retrieving revision 1.2
diff -u -r1.2 patch-ag
--- chat/eggdrop/patches/patch-ag	2002/09/12 17:10:34	1.2
+++ chat/eggdrop/patches/patch-ag	2003/01/16 01:14:06
@@ -7,7 +7,7 @@
  # make modules
  SHLIB_CC = @SHLIB_CC@
 -SHLIB_LD = @SHLIB_LD@
-+SHLIB_LD = @SHLIB_LD@ -R@TCLLIB@
++SHLIB_LD = @SHLIB_LD@ $(_OPSYS_RPATH_NAME)@TCLLIB@
  SHLIB_STRIP = @SHLIB_STRIP@
  MOD_EXT = @MOD_EXT@
  
@@ -15,7 +15,7 @@
  # stuff for Tcl
  XREQS = @TCL_REQS@
  XLIBS = @TCL_LIBS@ @LIBS@
-+XLDFLAGS = -Wl,-R@TCLLIB@
++XLDFLAGS = -Wl,$(_OPSYS_RPATH_NAME)@TCLLIB@
  TCLLIB = @TCLLIB@
  TCLLIBFN = @TCLLIBFN@
  

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