diff --git a/evbsc/README b/evbsc/README index bd0caac67..fc9a62de6 100644 --- a/evbsc/README +++ b/evbsc/README @@ -1,43 +1,44 @@ evbsc ------------------------------------------ -evbsc - beanstalkclient library embeded into libev +Beanstalkclient library embeded into libev Runtime requirements: - cygwin-1.7.9-1 - libbeanstalkclient1-1.0+git20101118-1bl1 - libev4-4.04-1bl1 + cygwin-2.0.1-1 + libbeanstalkclient1-1.0+git20101118-1bl2 + libev4-4.15-1bl3 + libevbsc-devel-1.0+git20100920-1bl2 + libevbsc1-1.0+git20100920-1bl2 Build requirements: (besides corresponding -devel packages) - autoconf-10-1 - automake-4-10 - binutils-2.22.51-1 - cygport-0.10.7-1 - gawk-4.0.0-1 - gcc4-core-4.5.3-3 - libtool-2.4-1 - make-3.82.90-1 + autoconf-13-1 + automake-9-1 + binutils-2.25-1 + cygport-0.18.1-1 + gcc-core-4.9.2-3 + libtool-2.4.6-1 + make-4.1-1 Canonical website: https://github.com/bergundy/evbsc Canonical download: - git://github.com/bergundy/evbsc.git + https://github.com/bergundy/evbsc.git ------------------------------------------- Build instructions: - unpack evbsc-1.0+git20100920-X-src.tar.bz2 - if you use setup to install this src package, it will be - unpacked under /usr/src automatically - cd /usr/src - cygport ./evbsc-1.0+git20100920-X.cygport all + 1. unpack evbsc-1.0+git20100920-X-src.tar.xz + 2. if you use setup to install this src package, + it will be unpacked under /usr/src automatically + % cd /usr/src + % cygport ./evbsc-1.0+git20100920-X.cygport all This will create: - /usr/src/evbsc-1.0+git20100920-X-src.tar.bz2 - /usr/src/evbsc-1.0+git20100920-X.tar.bz2 - /usr/src/libevbsc1-1.0+git20100920-X.tar.bz2 - /usr/src/libevbsc-devel-1.0+git20100920-X.tar.bz2 + /usr/src/evbsc-1.0+git20100920-X-src.tar.xz + /usr/src/evbsc-1.0+git20100920-X.tar.xz + /usr/src/libevbsc1-1.0+git20100920-X.tar.xz + /usr/src/libevbsc-devel-1.0+git20100920-X.tar.xz ------------------------------------------- @@ -54,12 +55,15 @@ Files included in the binary package: (libevbsc-devel) /usr/include/evbsc.h /usr/lib/libevbsc.dll.a - /usr/lib/libevbsc.la + /usr/lib/pkgconfig/evbsc.pc ------------------ Port Notes: +----- version 1.0+git20100920-1bl2 ----- +Rebuild on x86_64 + ----- version 1.0+git20100920-1bl1 ----- Initial release for Cygwin-1.7 by fd0 diff --git a/evbsc/evbsc-1.0+git20100920-1bl1.cygport b/evbsc/evbsc-1.0+git20100920-1bl1.cygport deleted file mode 100644 index a4967a03a..000000000 --- a/evbsc/evbsc-1.0+git20100920-1bl1.cygport +++ /dev/null @@ -1,26 +0,0 @@ -GIT_URI="git://github.com/bergundy/${PN}.git" -inherit git - -DESCRIPTION="Beanstalkclient library embeded into libev" -HOMEPAGE="https://github.com/bergundy/${PN}" - -CYGCONF_ARGS=" - --disable-static - --enable-tests -" - -PKG_NAMES=" - ${PN} - lib${PN}1 - lib${PN}-devel -" -evbsc_CONTENTS=" - usr/share -" -libevbsc1_CONTENTS=" - usr/bin -" -libevbsc_devel_CONTENTS=" - usr/include - usr/lib -" diff --git a/evbsc/evbsc-1.0+git20100920-1bl1.src.patch b/evbsc/evbsc-1.0+git20100920-1bl1.src.patch deleted file mode 100644 index bbe510b94..000000000 --- a/evbsc/evbsc-1.0+git20100920-1bl1.src.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- origsrc/evbsc/Makefile.am 2012-02-03 23:22:23.000000000 +0900 -+++ src/evbsc/Makefile.am 2012-02-03 23:24:41.036055900 +0900 -@@ -1,4 +1,3 @@ --ACLOCAL_AMFLAGS=-I m4 - - if BUILD_TESTS - MAYBE_OPT = . tests ---- origsrc/evbsc/src/Makefile.am 2012-02-03 23:22:23.000000000 +0900 -+++ src/evbsc/src/Makefile.am 2012-02-03 23:32:10.985989700 +0900 -@@ -3,4 +3,6 @@ LIBEVBSC_VERSION = 1:0:0 - lib_LTLIBRARIES = libevbsc.la - libevbsc_la_SOURCES = evbsc.c - include_HEADERS = evbsc.h --libevbsc_la_LDFLAGS = -version-info $(LIBEVBSC_VERSION) -+libevbsc_la_LDFLAGS = -version-info $(LIBEVBSC_VERSION) -no-undefined -+libevbsc_la_CPPFLAGS = -I/usr/include/libbeanstalkclient -+libevbsc_la_LIBADD = -lev ---- origsrc/evbsc/tests/Makefile.am 2012-02-03 23:22:23.000000000 +0900 -+++ src/evbsc/tests/Makefile.am 2012-02-03 23:38:24.164597700 +0900 -@@ -1,9 +1,8 @@ - TESTS = evbsc.t - check_PROGRAMS = $(TESTS) - --srcdir = $(top_builddir)/src --AM_CFLAGS = -I$(srcdir) -+AM_CFLAGS = -I$(top_srcdir)/src -I/usr/include/libbeanstalkclient - - evbsc_t_SOURCES = check_evbsc.c evbsc.h - evbsc_t_CFLAGS = @CHECK_CFLAGS@ $(AM_CFLAGS) --evbsc_t_LDADD = @CHECK_LIBS@ $(srcdir)/*.o -+evbsc_t_LDADD = @CHECK_LIBS@ $(top_builddir)/src/libevbsc.la diff --git a/evbsc/evbsc-1.0+git20100920-1bl2.cygport b/evbsc/evbsc-1.0+git20100920-1bl2.cygport new file mode 100644 index 000000000..bf1000101 --- /dev/null +++ b/evbsc/evbsc-1.0+git20100920-1bl2.cygport @@ -0,0 +1,32 @@ +HOMEPAGE="https://github.com/bergundy/${PN}" +GIT_URI="https://github.com/bergundy/${PN}.git" + +CATEGORY="Libs" +SUMMARY="Beanstalkclient library embeded into libev" +DESCRIPTION="${SUMMARY}" + +inherit git + +CYGCONF_ARGS=" + --enable-tests +" + +PKG_NAMES=" + ${PN} + lib${PN}1 + lib${PN}-devel +" +evbsc_CONTENTS=" + usr/share +" +libevbsc1_CONTENTS=" + usr/bin +" +libevbsc_devel_CONTENTS=" + usr/include + usr/lib +" + +evbsc_SUMMARY="${SUMMARY} (licensing & readmes)" +libevbsc1_SUMMARY="${SUMMARY} (runtime)" +libevbsc_devel_SUMMARY="${SUMMARY} (development)" diff --git a/evbsc/evbsc-1.0+git20100920-1bl2.src.patch b/evbsc/evbsc-1.0+git20100920-1bl2.src.patch new file mode 100644 index 000000000..7ded47dc6 --- /dev/null +++ b/evbsc/evbsc-1.0+git20100920-1bl2.src.patch @@ -0,0 +1,78 @@ +--- origsrc/evbsc/Makefile.am 2015-05-02 14:11:43.000000000 +0900 ++++ src/evbsc/Makefile.am 2015-05-02 14:21:56.925766400 +0900 +@@ -5,3 +5,6 @@ MAYBE_OPT = . tests + endif + + SUBDIRS = src $(MAYBE_OPT) ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = evbsc.pc +--- origsrc/evbsc/configure.ac 2015-05-02 14:11:43.000000000 +0900 ++++ src/evbsc/configure.ac 2015-05-02 14:22:02.314595300 +0900 +@@ -2,7 +2,7 @@ AC_PREREQ([2.59]) + AC_INIT([libevbsc], [1.0], [roey.berman@gmail.com]) + AC_CONFIG_SRCDIR([src/evbsc.c]) + AC_CONFIG_HEADERS([config.h]) +-AM_INIT_AUTOMAKE([foreign -Wall -Werror]) ++AM_INIT_AUTOMAKE([foreign -Wall]) + + AC_ARG_ENABLE(tests,[ --enable-tests build tests],[ + PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) +@@ -23,9 +23,9 @@ AM_PROG_CC_C_O + AC_SUBST(LIBTOOL_DEPS) + + # Checks for libraries. +-AC_CHECK_LIB([beanstalkclient], [bsc_new]) +-AC_CHECK_LIB([check], [tcase_create]) +-AC_CHECK_LIB([ev], [ev_loop]) ++PKG_CHECK_MODULES([LIBBEANSTALKCLIENT], [libbeanstalkclient]) ++PKG_CHECK_MODULES([CHECK], [check]) ++PKG_CHECK_MODULES([LIBEV], [libev]) + + # Checks for header files. + AC_CHECK_HEADERS([stdlib.h string.h]) +@@ -37,7 +37,7 @@ AC_TYPE_SIZE_T + # Checks for library functions. + AC_FUNC_MALLOC + +-AC_CONFIG_FILES([Makefile ++AC_CONFIG_FILES([evbsc.pc Makefile + src/Makefile + tests/Makefile]) + +--- origsrc/evbsc/evbsc.pc.in 1970-01-01 09:00:00.000000000 +0900 ++++ src/evbsc/evbsc.pc.in 2015-05-02 14:21:38.988043400 +0900 +@@ -0,0 +1,9 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++Name: evbsc ++Description: Beanstalkclient library embeded into libev ++Version: @VERSION@ ++Libs: -L${libdir} -levbsc ++Cflags: -I${includedir} +--- origsrc/evbsc/src/Makefile.am 2015-05-02 14:11:43.000000000 +0900 ++++ src/evbsc/src/Makefile.am 2015-05-02 14:20:03.615133300 +0900 +@@ -3,4 +3,6 @@ LIBEVBSC_VERSION = 1:0:0 + lib_LTLIBRARIES = libevbsc.la + libevbsc_la_SOURCES = evbsc.c + include_HEADERS = evbsc.h +-libevbsc_la_LDFLAGS = -version-info $(LIBEVBSC_VERSION) ++libevbsc_la_LDFLAGS = -no-undefined -version-info $(LIBEVBSC_VERSION) ++libevbsc_la_CPPFLAGS = $(LIBBEANSTALKCLIENT_CFLAGS) $(LIBEV_CFLAGS) ++libevbsc_la_LIBADD = $(LIBBEANSTALKCLIENT_LIBS) $(LIBEV_LIBS) +--- origsrc/evbsc/tests/Makefile.am 2015-05-02 14:11:43.000000000 +0900 ++++ src/evbsc/tests/Makefile.am 2015-05-02 14:20:25.940895600 +0900 +@@ -1,9 +1,8 @@ + TESTS = evbsc.t + check_PROGRAMS = $(TESTS) + +-srcdir = $(top_builddir)/src +-AM_CFLAGS = -I$(srcdir) ++AM_CFLAGS = -I$(top_srcdir)/src $(LIBBEANSTALKCLIENT_CFLAGS) $(LIBEV_CFLAGS) + + evbsc_t_SOURCES = check_evbsc.c evbsc.h + evbsc_t_CFLAGS = @CHECK_CFLAGS@ $(AM_CFLAGS) +-evbsc_t_LDADD = @CHECK_LIBS@ $(srcdir)/*.o ++evbsc_t_LDADD = @CHECK_LIBS@ $(top_builddir)/src/libevbsc.la diff --git a/evbsc/evbsc.hint b/evbsc/evbsc.hint deleted file mode 100644 index 0265d51cf..000000000 --- a/evbsc/evbsc.hint +++ /dev/null @@ -1,4 +0,0 @@ -category: Libs -requires: cygwin libevbsc1 -sdesc: "Beanstalkclient library embeded into libev (licensing & readmes)" -ldesc: "evbsc - beanstalkclient library embeded into libev" diff --git a/evbsc/libevbsc-devel.hint b/evbsc/libevbsc-devel.hint deleted file mode 100644 index 94808064a..000000000 --- a/evbsc/libevbsc-devel.hint +++ /dev/null @@ -1,5 +0,0 @@ -category: Devel Libs -requires: cygwin libevbsc1 -external-source: evbsc -sdesc: "Beanstalkclient library embeded into libev (development)" -ldesc: "evbsc - beanstalkclient library embeded into libev" diff --git a/evbsc/libevbsc1.hint b/evbsc/libevbsc1.hint deleted file mode 100644 index 36f8f9cbf..000000000 --- a/evbsc/libevbsc1.hint +++ /dev/null @@ -1,5 +0,0 @@ -category: Libs -requires: cygwin libbeanstalkclient1 libev4 -external-source: evbsc -sdesc: "Beanstalkclient library embeded into libev (runtime)" -ldesc: "evbsc - beanstalkclient library embeded into libev"