[csw-devel] SF.net SVN: gar:[20817] csw/mgar/pkg/znc/trunk
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Fri Apr 19 15:53:45 CEST 2013
Revision: 20817
http://gar.svn.sourceforge.net/gar/?rev=20817&view=rev
Author: wilbury
Date: 2013-04-19 13:53:43 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
znc/trunk: Fix build, man pages, install.
Modified Paths:
--------------
csw/mgar/pkg/znc/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/znc/trunk/files/0001-check-for-and-define-timeradd-and-timersub.patch
csw/mgar/pkg/znc/trunk/files/0003-Fix-mt-libraries.patch
csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch
csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch
Removed Paths:
-------------
csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch
Modified: csw/mgar/pkg/znc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/znc/trunk/Makefile 2013-04-19 12:25:46 UTC (rev 20816)
+++ csw/mgar/pkg/znc/trunk/Makefile 2013-04-19 13:53:43 UTC (rev 20817)
@@ -13,13 +13,19 @@
VENDOR_URL = http://http://wiki.znc.in/ZNC
MASTER_SITES = http://znc.in/releases/
DISTFILES = $(DISTNAME).tar.gz
-PATCHFILES += 0001-fix-man-pages.patch
+PATCHFILES += 0001-check-for-and-define-timeradd-and-timersub.patch
PATCHFILES += 0002-fix-znc.1-manpage.patch
+PATCHFILES += 0003-Fix-mt-libraries.patch
+PATCHFILES += 0004-Use-proper-zoneinfo-path.patch
+PATCHFILES += 0005-fix-man-pages.patch
LICENSE = LICENSE
+# Do not create .git
+NOGITPATCH = 1
+
PACKAGES += CSWznc
SPKG_DESC_CSWznc = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWznc += CSWlibcares2
+RUNTIME_DEP_PKGS_CSWznc += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWznc += CSWlibssl1-0-0
RUNTIME_DEP_PKGS_CSWznc += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWznc += CSWlibstdc++6
@@ -34,6 +40,10 @@
RUNTIME_DEP_PKGS_CSWznc-dev += CSWznc
RUNTIME_DEP_PKGS_CSWznc-dev += CSWlibcares-dev
+
+# there is /usr/share/lib/zoneinfo
+CHECKPKG_OVERRIDES_CSWznc += file-with-bad-content|/usr/share|root/opt/csw/bin/znc
+
# File name regex to get notifications about upstream software releases
# NOTE: Use this only if the automatic regex creation
# does not work for your package
@@ -46,6 +56,8 @@
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
GARCOMPILER = GNU
CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-openssl=/opt/csw
+CONFIGURE_ARGS += --with-module-prefix=$(libexecdir)/znc
# --enable-perl and --enable-python do not work. perl autotools check is broke; python module does not compile
#CONFIGURE_ARGS = $(DIRPATHS) --enable-perl --enable-python
Added: csw/mgar/pkg/znc/trunk/files/0001-check-for-and-define-timeradd-and-timersub.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0001-check-for-and-define-timeradd-and-timersub.patch (rev 0)
+++ csw/mgar/pkg/znc/trunk/files/0001-check-for-and-define-timeradd-and-timersub.patch 2013-04-19 13:53:43 UTC (rev 20817)
@@ -0,0 +1,51 @@
+From c552454bcb8ffac11a862b1f2d3980282033394b Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Tue, 16 Apr 2013 15:16:33 +0200
+Subject: [PATCH] check for and define timeradd and timersub
+
+---
+ src/Csocket.cpp | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/src/Csocket.cpp b/src/Csocket.cpp
+index 6ba945b..bdcae5d 100644
+--- a/src/Csocket.cpp
++++ b/src/Csocket.cpp
+@@ -57,6 +57,34 @@
+
+ using namespace std;
+
++#if !defined(timeradd)
++#define timeradd(tvp, uvp, vvp) \
++ do \
++ { \
++ (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
++ (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \
++ if ((vvp)->tv_usec >= 1000000) \
++ { \
++ (vvp)->tv_sec++; \
++ (vvp)->tv_usec -= 1000000; \
++ } \
++ } while (0)
++#endif /* !defined(timeradd) */
++
++#if !defined(timersub)
++#define timersub(tvp, uvp, vvp) \
++ do \
++ { \
++ (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
++ (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
++ if ((vvp)->tv_usec < 0) \
++ { \
++ (vvp)->tv_sec--; \
++ (vvp)->tv_usec += 1000000; \
++ } \
++ } while (0)
++#endif /* !defined(timersub) */
++
+ #define CREATE_ARES_VER( a, b, c ) ((a<<16)|(b<<8)|c)
+
+ #ifndef _NO_CSOCKET_NS // some people may not want to use a namespace
+--
+1.8.1.4
+
Deleted: csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch 2013-04-19 12:25:46 UTC (rev 20816)
+++ csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch 2013-04-19 13:53:43 UTC (rev 20817)
@@ -1,33 +0,0 @@
-From 57463f22c5abc29dac495340197022fd17a9e986 Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at opencsw.org>
-Date: Mon, 2 Apr 2012 09:02:40 +0200
-Subject: [PATCH] fix-man-pages
-
----
- man/Makefile.in | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/man/Makefile.in b/man/Makefile.in
-index 145d14f..19aafdc 100644
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -11,7 +11,7 @@ mandir := @mandir@
- INSTALL := @INSTALL@
- INSTALL_DATA := @INSTALL_DATA@
-
--MAN1 := znc.1.gz znc-buildmod.1.gz znc-config.1.gz
-+MAN1 := znc.1 znc-buildmod.1 znc-config.1
-
- ifneq "$(V)" ""
- VERBOSE=1
-@@ -28,7 +28,6 @@ all: $(MAN1)
-
- %.1.gz: %.1 Makefile
- $(E) Packing man page $@...
-- $(Q)gzip -9 <$< >$@
-
- clean:
- -rm -f $(MAN1)
---
-1.7.9
-
Added: csw/mgar/pkg/znc/trunk/files/0003-Fix-mt-libraries.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0003-Fix-mt-libraries.patch (rev 0)
+++ csw/mgar/pkg/znc/trunk/files/0003-Fix-mt-libraries.patch 2013-04-19 13:53:43 UTC (rev 20817)
@@ -0,0 +1,31 @@
+diff -ruN znc-1.0/configure znc-1.0-otis/configure
+--- znc-1.0/configure 2012-11-06 17:02:24.000000000 +0100
++++ znc-1.0-otis/configure 2013-04-18 15:08:43.933912666 +0200
+@@ -3670,7 +3670,7 @@
+ # which indicates that we try without any flags at all, and "pthread-config"
+ # which is a program returning the flags for the Pth emulation library.
+
+-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe pthread-config"
+
+ # The ordering *is* (sometimes) important. Some notes on the
+ # individual items follow:
+@@ -3703,7 +3703,7 @@
+ # who knows whether they'll stub that too in a future libc.) So,
+ # we'll just look for -pthreads and -lpthread first:
+
+- ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
++ ax_pthread_flags="-pthreads pthread -pthread $ax_pthread_flags"
+ ;;
+
+ *-darwin*)
+@@ -3879,7 +3879,7 @@
+ if test "$GCC" = "yes"; then
+ flag="-D_REENTRANT"
+ else
+- flag="-mt -D_REENTRANT"
++ flag="-D_REENTRANT"
+ fi
+ ;;
+ esac
+
Added: csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch (rev 0)
+++ csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch 2013-04-19 13:53:43 UTC (rev 20817)
@@ -0,0 +1,12 @@
+--- znc-1.0/src/Utils.cpp 2012-11-06 17:02:20.000000000 +0100
++++ znc-1.0-otis/src/Utils.cpp 2013-04-19 15:29:29.582526029 +0200
+@@ -426,7 +426,7 @@
+
+ SCString CUtils::GetTimezones() {
+ SCString result;
+- FillTimezones("/usr/share/zoneinfo", result, "");
++ FillTimezones("/usr/share/lib/zoneinfo", result, "");
+ return result;
+ }
+
+
Added: csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch (rev 0)
+++ csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch 2013-04-19 13:53:43 UTC (rev 20817)
@@ -0,0 +1,33 @@
+From 57463f22c5abc29dac495340197022fd17a9e986 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Mon, 2 Apr 2012 09:02:40 +0200
+Subject: [PATCH] fix-man-pages
+
+---
+ man/Makefile.in | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/man/Makefile.in b/man/Makefile.in
+index 145d14f..19aafdc 100644
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -11,7 +11,7 @@ mandir := @mandir@
+ INSTALL := @INSTALL@
+ INSTALL_DATA := @INSTALL_DATA@
+
+-MAN1 := znc.1.gz znc-buildmod.1.gz znc-config.1.gz
++MAN1 := znc.1 znc-buildmod.1 znc-config.1
+
+ ifneq "$(V)" ""
+ VERBOSE=1
+@@ -28,7 +28,6 @@ all: $(MAN1)
+
+ %.1.gz: %.1 Makefile
+ $(E) Packing man page $@...
+- $(Q)gzip -9 <$< >$@
+
+ clean:
+ -rm -f $(MAN1)
+--
+1.7.9
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list