Fri May 10 01:22:28 2013 UTC ()
Split off py-libevent-rpcgen from devel/libevent.

Obviates libevent's python dependency, enabling cross-compilation of
libevent's dependents without having to cross-compile python itself.

ok agc


(riastradh)
diff -r1.1739 -r1.1740 pkgsrc/devel/Makefile
diff -r1.43 -r1.44 pkgsrc/devel/libevent/Makefile
diff -r0 -r1.1 pkgsrc/devel/libevent/Makefile.common
diff -r1.6 -r1.7 pkgsrc/devel/libevent/PLIST
diff -r1.28 -r1.29 pkgsrc/devel/libevent/distinfo
diff -r0 -r1.1 pkgsrc/devel/libevent/patches/patch-Makefile.am
diff -r0 -r1.1 pkgsrc/devel/libevent/patches/patch-Makefile.in
diff -r0 -r1.1 pkgsrc/devel/py-libevent-rpcgen/DESCR
diff -r0 -r1.1 pkgsrc/devel/py-libevent-rpcgen/Makefile
diff -r0 -r1.1 pkgsrc/devel/py-libevent-rpcgen/PLIST
diff -r0 -r1.1 pkgsrc/devel/py-libevent-rpcgen/distinfo

cvs diff -r1.1739 -r1.1740 pkgsrc/devel/Makefile (expand / switch to context diff)
--- pkgsrc/devel/Makefile 2013/05/09 13:53:47 1.1739
+++ pkgsrc/devel/Makefile 2013/05/10 01:22:27 1.1740
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1739 2013/05/09 13:53:47 joerg Exp $
+# $NetBSD: Makefile,v 1.1740 2013/05/10 01:22:27 riastradh Exp $
 #
 
 COMMENT=	Development utilities
@@ -1369,6 +1369,7 @@
 SUBDIR+=	py-jersey
 SUBDIR+=	py-kjbuckets
 SUBDIR+=	py-kqueue
+SUBDIR+=	py-libevent-rpcgen
 SUBDIR+=	py-lockfile
 SUBDIR+=	py-logilab-astng
 SUBDIR+=	py-logilab-common

cvs diff -r1.43 -r1.44 pkgsrc/devel/libevent/Makefile (expand / switch to context diff)
--- pkgsrc/devel/libevent/Makefile 2013/02/06 23:21:03 1.43
+++ pkgsrc/devel/libevent/Makefile 2013/05/10 01:22:27 1.44
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2013/02/06 23:21:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.44 2013/05/10 01:22:27 riastradh Exp $
 
-DISTNAME=	libevent-2.0.21-stable
-PKGNAME=	${DISTNAME:S/-stable//}
-PKGREVISION=	1
+.include "../../devel/libevent/Makefile.common"
+
+PKGNAME=	libevent-${LIBEVENT_VERSION}
+PKGREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=levent/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://libevent.org/
@@ -18,7 +18,6 @@
 PKGCONFIG_OVERRIDE+=	libevent_openssl.pc.in
 PKGCONFIG_OVERRIDE+=	libevent_pthreads.pc.in
 PKGCONFIG_OVERRIDE+=	libevent.pc.in
-REPLACE_PYTHON=		event_rpcgen.py
 TEST_TARGET=		verify
 
 LIBS.SunOS+=	-lnsl -lresolv
@@ -34,6 +33,5 @@
 CPPFLAGS+=		-Dstrtoll=__strtoll
 .endif
 
-.include "../../lang/python/application.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/devel/libevent/Makefile.common
# $NetBSD: Makefile.common,v 1.1 2013/05/10 01:22:27 riastradh Exp $

# used by devel/libevent/Makefile
# used by devel/py-libevent-rpcgen/Makefile

LIBEVENT_VERSION=	2.0.21

DISTNAME=		libevent-${LIBEVENT_VERSION}-stable
MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=levent/}

cvs diff -r1.6 -r1.7 pkgsrc/devel/libevent/PLIST (expand / switch to context diff)
--- pkgsrc/devel/libevent/PLIST 2011/02/11 21:13:47 1.6
+++ pkgsrc/devel/libevent/PLIST 2013/05/10 01:22:27 1.7
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2011/02/11 21:13:47 tnn Exp $
-bin/event_rpcgen.py
+@comment $NetBSD: PLIST,v 1.7 2013/05/10 01:22:27 riastradh Exp $
 include/evdns.h
 include/event.h
 include/event2/buffer.h

cvs diff -r1.28 -r1.29 pkgsrc/devel/libevent/distinfo (expand / switch to context diff)
--- pkgsrc/devel/libevent/distinfo 2012/12/16 11:26:07 1.28
+++ pkgsrc/devel/libevent/distinfo 2013/05/10 01:22:27 1.29
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.28 2012/12/16 11:26:07 wiz Exp $
+$NetBSD: distinfo,v 1.29 2013/05/10 01:22:27 riastradh Exp $
 
 SHA1 (libevent-2.0.21-stable.tar.gz) = 3e6674772eb77de24908c6267c698146420ab699
 RMD160 (libevent-2.0.21-stable.tar.gz) = 7345c8fa2d70ee3e5555b5911d9d8cb97614d644
 Size (libevent-2.0.21-stable.tar.gz) = 850772 bytes
+SHA1 (patch-Makefile.am) = 2518403715eabaeef5e7edfccf3732607cba6309
+SHA1 (patch-Makefile.in) = 23b6f6ce916d5c04af9aa75ba40f007b4358aae0

File Added: pkgsrc/devel/libevent/patches/Attic/patch-Makefile.am
$NetBSD: patch-Makefile.am,v 1.1 2013/05/10 01:22:27 riastradh Exp $

Don't install event_rpcgen.py.

--- Makefile.am.orig	2012-11-18 06:38:50.000000000 +0000
+++ Makefile.am
@@ -86,7 +86,7 @@ VERSION_INFO = 6:9:1
 # series won't be binary-compatible.
 
 if INSTALL_LIBEVENT
-dist_bin_SCRIPTS = event_rpcgen.py
+dist_bin_SCRIPTS = 
 endif
 
 pkgconfigdir=$(libdir)/pkgconfig

File Added: pkgsrc/devel/libevent/patches/patch-Makefile.in
$NetBSD: patch-Makefile.in,v 1.1 2013/05/10 01:22:27 riastradh Exp $

Don't install event_rpcgen.py.

--- Makefile.in.orig	2012-11-19 15:13:17.000000000 +0000
+++ Makefile.in
@@ -210,7 +210,7 @@ libevent_pthreads_la_LINK = $(LIBTOOL) -
 @INSTALL_LIBEVENT_FALSE@@PTHREADS_TRUE@am_libevent_pthreads_la_rpath =
 @INSTALL_LIBEVENT_TRUE@@PTHREADS_TRUE@am_libevent_pthreads_la_rpath =  \
 @INSTALL_LIBEVENT_TRUE@@PTHREADS_TRUE@	-rpath $(libdir)
-am__dist_bin_SCRIPTS_DIST = event_rpcgen.py
+am__dist_bin_SCRIPTS_DIST = 
 SCRIPTS = $(dist_bin_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -508,7 +508,7 @@ VERSION_INFO = 6:9:1
 # nice and rare.  For the next couple of years, though, 'struct event'
 # is user-visible, and so we can pretty much guarantee that release
 # series won't be binary-compatible.
-@INSTALL_LIBEVENT_TRUE@dist_bin_SCRIPTS = event_rpcgen.py
+@INSTALL_LIBEVENT_TRUE@dist_bin_SCRIPTS = 
 pkgconfigdir = $(libdir)/pkgconfig
 LIBEVENT_PKGCONFIG = libevent.pc $(am__append_2) $(am__append_4)
 

File Added: pkgsrc/devel/py-libevent-rpcgen/DESCR
Python script to generate C code for RPC marshalling with libevent.

File Added: pkgsrc/devel/py-libevent-rpcgen/Makefile
# $NetBSD: Makefile,v 1.1 2013/05/10 01:22:27 riastradh Exp $

.include "../../libevent/devel/Makefile.common"

DISTNAME=	py-libevent-rpcgen-${LIBEVENT_VERSION}
CATEGORIES=	devel

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	http://libevent.org/
COMMENT=	Python libevent rpcgen script
LICENSE=	modified-bsd

REPLACE_PYTHON=		event_rpcgen.py

do-configure:
do-build:

do-install:
	${INSTALL_SCRIPT} ${WRKSRC}/event_rpcgen.py ${DESTDIR}${PREFIX}/bin

.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/devel/py-libevent-rpcgen/PLIST
@comment $NetBSD: PLIST,v 1.1 2013/05/10 01:22:27 riastradh Exp $
bin/event_rpcgen.py

File Added: pkgsrc/devel/py-libevent-rpcgen/Attic/distinfo
$NetBSD: distinfo,v 1.1 2013/05/10 01:22:28 riastradh Exp $

SHA1 (libevent-2.0.21-stable.tar.gz) = 3e6674772eb77de24908c6267c698146420ab699
RMD160 (libevent-2.0.21-stable.tar.gz) = 7345c8fa2d70ee3e5555b5911d9d8cb97614d644
Size (libevent-2.0.21-stable.tar.gz) = 850772 bytes