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 unified diff)

--- pkgsrc/devel/Makefile 2013/05/09 13:53:47 1.1739
+++ pkgsrc/devel/Makefile 2013/05/10 01:22:27 1.1740
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1739 2013/05/09 13:53:47 joerg Exp $ 1# $NetBSD: Makefile,v 1.1740 2013/05/10 01:22:27 riastradh Exp $
2# 2#
3 3
4COMMENT= Development utilities 4COMMENT= Development utilities
5 5
6SUBDIR+= ETL 6SUBDIR+= ETL
7SUBDIR+= ExmanIDE 7SUBDIR+= ExmanIDE
8SUBDIR+= GConf 8SUBDIR+= GConf
9SUBDIR+= GConf-ui 9SUBDIR+= GConf-ui
10SUBDIR+= Gorm 10SUBDIR+= Gorm
11SUBDIR+= ObjectiveLib 11SUBDIR+= ObjectiveLib
12SUBDIR+= ProjectCenter 12SUBDIR+= ProjectCenter
13SUBDIR+= RBTools 13SUBDIR+= RBTools
14SUBDIR+= RTFM 14SUBDIR+= RTFM
@@ -1359,26 +1359,27 @@ SUBDIR+= py-funcparserlib @@ -1359,26 +1359,27 @@ SUBDIR+= py-funcparserlib
1359SUBDIR+= py-game 1359SUBDIR+= py-game
1360SUBDIR+= py-generate 1360SUBDIR+= py-generate
1361SUBDIR+= py-gobject 1361SUBDIR+= py-gobject
1362SUBDIR+= py-gobject-shared 1362SUBDIR+= py-gobject-shared
1363SUBDIR+= py-gobject3 1363SUBDIR+= py-gobject3
1364SUBDIR+= py-hgtools 1364SUBDIR+= py-hgtools
1365SUBDIR+= py-idle 1365SUBDIR+= py-idle
1366SUBDIR+= py-ipython 1366SUBDIR+= py-ipython
1367SUBDIR+= py-ipython012 1367SUBDIR+= py-ipython012
1368SUBDIR+= py-ipython013 1368SUBDIR+= py-ipython013
1369SUBDIR+= py-jersey 1369SUBDIR+= py-jersey
1370SUBDIR+= py-kjbuckets 1370SUBDIR+= py-kjbuckets
1371SUBDIR+= py-kqueue 1371SUBDIR+= py-kqueue
 1372SUBDIR+= py-libevent-rpcgen
1372SUBDIR+= py-lockfile 1373SUBDIR+= py-lockfile
1373SUBDIR+= py-logilab-astng 1374SUBDIR+= py-logilab-astng
1374SUBDIR+= py-logilab-common 1375SUBDIR+= py-logilab-common
1375SUBDIR+= py-mako 1376SUBDIR+= py-mako
1376SUBDIR+= py-mock 1377SUBDIR+= py-mock
1377SUBDIR+= py-msgpack 1378SUBDIR+= py-msgpack
1378SUBDIR+= py-multiprocessing 1379SUBDIR+= py-multiprocessing
1379SUBDIR+= py-nose 1380SUBDIR+= py-nose
1380SUBDIR+= py-ordereddict 1381SUBDIR+= py-ordereddict
1381SUBDIR+= py-pep8 1382SUBDIR+= py-pep8
1382SUBDIR+= py-pexpect 1383SUBDIR+= py-pexpect
1383SUBDIR+= py-pip 1384SUBDIR+= py-pip
1384SUBDIR+= py-polib 1385SUBDIR+= py-polib
cvs diff -r1.43 -r1.44 pkgsrc/devel/libevent/Makefile (expand / switch to unified 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,39 +1,37 @@ @@ -1,39 +1,37 @@
1# $NetBSD: Makefile,v 1.43 2013/02/06 23:21:03 jperkin Exp $ 1# $NetBSD: Makefile,v 1.44 2013/05/10 01:22:27 riastradh Exp $
2 2
3DISTNAME= libevent-2.0.21-stable 3.include "../../devel/libevent/Makefile.common"
4PKGNAME= ${DISTNAME:S/-stable//} 4
5PKGREVISION= 1 5PKGNAME= libevent-${LIBEVENT_VERSION}
 6PKGREVISION= 2
6CATEGORIES= devel 7CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=levent/} 
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://libevent.org/ 10HOMEPAGE= http://libevent.org/
11COMMENT= Asynchronous event notification library 11COMMENT= Asynchronous event notification library
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14CONFLICTS+= libev<3.9nb1 14CONFLICTS+= libev<3.9nb1
15 15
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18PKGCONFIG_OVERRIDE+= libevent_openssl.pc.in 18PKGCONFIG_OVERRIDE+= libevent_openssl.pc.in
19PKGCONFIG_OVERRIDE+= libevent_pthreads.pc.in 19PKGCONFIG_OVERRIDE+= libevent_pthreads.pc.in
20PKGCONFIG_OVERRIDE+= libevent.pc.in 20PKGCONFIG_OVERRIDE+= libevent.pc.in
21REPLACE_PYTHON= event_rpcgen.py 
22TEST_TARGET= verify 21TEST_TARGET= verify
23 22
24LIBS.SunOS+= -lnsl -lresolv 23LIBS.SunOS+= -lnsl -lresolv
25CPPFLAGS.SunOS+= -D__EXTENSIONS__ 24CPPFLAGS.SunOS+= -D__EXTENSIONS__
26 25
27# XXX helps build, but needs more testing 26# XXX helps build, but needs more testing
28#CFLAGS.Interix+= -Dsockaddr_storage=sockaddr_in -DNI_MAXSERV=32 27#CFLAGS.Interix+= -Dsockaddr_storage=sockaddr_in -DNI_MAXSERV=32
29 28
30.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
31 30
32.if !empty(MACHINE_PLATFORM:MHPUX-11.11-*) 31.if !empty(MACHINE_PLATFORM:MHPUX-11.11-*)
33CONFIGURE_ENV+= ac_cv_func_strtoll=yes 32CONFIGURE_ENV+= ac_cv_func_strtoll=yes
34CPPFLAGS+= -Dstrtoll=__strtoll 33CPPFLAGS+= -Dstrtoll=__strtoll
35.endif 34.endif
36 35
37.include "../../lang/python/application.mk" 
38.include "../../security/openssl/buildlink3.mk" 36.include "../../security/openssl/buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 37.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 unified 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,15 +1,14 @@ @@ -1,15 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2011/02/11 21:13:47 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.7 2013/05/10 01:22:27 riastradh Exp $
2bin/event_rpcgen.py 
3include/evdns.h 2include/evdns.h
4include/event.h 3include/event.h
5include/event2/buffer.h 4include/event2/buffer.h
6include/event2/buffer_compat.h 5include/event2/buffer_compat.h
7include/event2/bufferevent.h 6include/event2/bufferevent.h
8include/event2/bufferevent_compat.h 7include/event2/bufferevent_compat.h
9include/event2/bufferevent_ssl.h 8include/event2/bufferevent_ssl.h
10include/event2/bufferevent_struct.h 9include/event2/bufferevent_struct.h
11include/event2/dns.h 10include/event2/dns.h
12include/event2/dns_compat.h 11include/event2/dns_compat.h
13include/event2/dns_struct.h 12include/event2/dns_struct.h
14include/event2/event-config.h 13include/event2/event-config.h
15include/event2/event.h 14include/event2/event.h
cvs diff -r1.28 -r1.29 pkgsrc/devel/libevent/distinfo (expand / switch to unified 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 @@ @@ -1,5 +1,7 @@
1$NetBSD: distinfo,v 1.28 2012/12/16 11:26:07 wiz Exp $ 1$NetBSD: distinfo,v 1.29 2013/05/10 01:22:27 riastradh Exp $
2 2
3SHA1 (libevent-2.0.21-stable.tar.gz) = 3e6674772eb77de24908c6267c698146420ab699 3SHA1 (libevent-2.0.21-stable.tar.gz) = 3e6674772eb77de24908c6267c698146420ab699
4RMD160 (libevent-2.0.21-stable.tar.gz) = 7345c8fa2d70ee3e5555b5911d9d8cb97614d644 4RMD160 (libevent-2.0.21-stable.tar.gz) = 7345c8fa2d70ee3e5555b5911d9d8cb97614d644
5Size (libevent-2.0.21-stable.tar.gz) = 850772 bytes 5Size (libevent-2.0.21-stable.tar.gz) = 850772 bytes
 6SHA1 (patch-Makefile.am) = 2518403715eabaeef5e7edfccf3732607cba6309
 7SHA1 (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