Split off py-libevent-rpcgen from devel/libevent. Obviates libevent's python dependency. Index: devel/libevent/Makefile =================================================================== RCS file: /cvsroot/pkgsrc/devel/libevent/Makefile,v retrieving revision 1.43 diff -p -u -r1.43 Makefile --- devel/libevent/Makefile 6 Feb 2013 23:21:03 -0000 1.43 +++ devel/libevent/Makefile 23 Apr 2013 13:29:15 -0000 @@ -1,10 +1,10 @@ # $NetBSD: Makefile,v 1.43 2013/02/06 23:21:03 jperkin Exp $ -DISTNAME= libevent-2.0.21-stable -PKGNAME= ${DISTNAME:S/-stable//} +.include "../../devel/libevent/Makefile.common" + +PKGNAME= libevent-${LIBEVENT_VERSION} PKGREVISION= 1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=levent/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://libevent.org/ @@ -18,7 +18,6 @@ GNU_CONFIGURE= yes 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 @@ CONFIGURE_ENV+= ac_cv_func_strtoll=yes CPPFLAGS+= -Dstrtoll=__strtoll .endif -.include "../../lang/python/application.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: devel/libevent/Makefile.common =================================================================== RCS file: devel/libevent/Makefile.common diff -N devel/libevent/Makefile.common --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/libevent/Makefile.common 23 Apr 2013 13:29:15 -0000 @@ -0,0 +1,9 @@ +# $NetBSD$ + +# 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/} Index: devel/libevent/PLIST =================================================================== RCS file: /cvsroot/pkgsrc/devel/libevent/PLIST,v retrieving revision 1.6 diff -p -u -r1.6 PLIST --- devel/libevent/PLIST 11 Feb 2011 21:13:47 -0000 1.6 +++ devel/libevent/PLIST 23 Apr 2013 13:29:15 -0000 @@ -1,5 +1,4 @@ @comment $NetBSD: PLIST,v 1.6 2011/02/11 21:13:47 tnn Exp $ -bin/event_rpcgen.py include/evdns.h include/event.h include/event2/buffer.h Index: devel/libevent/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/devel/libevent/distinfo,v retrieving revision 1.28 diff -p -u -r1.28 distinfo --- devel/libevent/distinfo 16 Dec 2012 11:26:07 -0000 1.28 +++ devel/libevent/distinfo 23 Apr 2013 13:29:15 -0000 @@ -3,3 +3,5 @@ $NetBSD: distinfo,v 1.28 2012/12/16 11:2 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 Index: devel/libevent/patches/patch-Makefile.am =================================================================== RCS file: devel/libevent/patches/patch-Makefile.am diff -N devel/libevent/patches/patch-Makefile.am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/libevent/patches/patch-Makefile.am 23 Apr 2013 13:29:15 -0000 @@ -0,0 +1,15 @@ +$NetBSD$ + +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 Index: devel/libevent/patches/patch-Makefile.in =================================================================== RCS file: devel/libevent/patches/patch-Makefile.in diff -N devel/libevent/patches/patch-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/libevent/patches/patch-Makefile.in 23 Apr 2013 13:29:15 -0000 @@ -0,0 +1,24 @@ +$NetBSD$ + +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) + Index: devel/py-libevent-rpcgen/DESCR =================================================================== RCS file: devel/py-libevent-rpcgen/DESCR diff -N devel/py-libevent-rpcgen/DESCR --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/py-libevent-rpcgen/DESCR 23 Apr 2013 13:29:16 -0000 @@ -0,0 +1 @@ +Python script to generate C code for RPC marshalling with libevent. Index: devel/py-libevent-rpcgen/Makefile =================================================================== RCS file: devel/py-libevent-rpcgen/Makefile diff -N devel/py-libevent-rpcgen/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/py-libevent-rpcgen/Makefile 23 Apr 2013 13:29:16 -0000 @@ -0,0 +1,22 @@ +# $NetBSD$ + +.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" Index: devel/py-libevent-rpcgen/PLIST =================================================================== RCS file: devel/py-libevent-rpcgen/PLIST diff -N devel/py-libevent-rpcgen/PLIST --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/py-libevent-rpcgen/PLIST 23 Apr 2013 13:29:16 -0000 @@ -0,0 +1,2 @@ +@comment $NetBSD$ +bin/event_rpcgen.py Index: devel/py-libevent-rpcgen/distinfo =================================================================== RCS file: devel/py-libevent-rpcgen/distinfo diff -N devel/py-libevent-rpcgen/distinfo --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/py-libevent-rpcgen/distinfo 23 Apr 2013 13:29:16 -0000 @@ -0,0 +1,5 @@ +$NetBSD$ + +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