pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/ser Various fixes so this works on 1.6.1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/173ca29f18a9
branches:  trunk
changeset: 460318:173ca29f18a9
user:      jmc <jmc%pkgsrc.org@localhost>
date:      Thu Aug 28 04:13:10 2003 +0000

description:
Various fixes so this works on 1.6.1

diffstat:

 chat/ser/Makefile         |   4 +++-
 chat/ser/distinfo         |   4 ++--
 chat/ser/patches/patch-aa |  37 ++++++++++++++++++++++++-------------
 3 files changed, 29 insertions(+), 16 deletions(-)

diffs (90 lines):

diff -r 60b0d735ef47 -r 173ca29f18a9 chat/ser/Makefile
--- a/chat/ser/Makefile Thu Aug 28 03:50:15 2003 +0000
+++ b/chat/ser/Makefile Thu Aug 28 04:13:10 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/08/28 03:50:15 jmc Exp $
+# $NetBSD: Makefile,v 1.3 2003/08/28 04:13:10 jmc Exp $
 #
 
 DISTNAME=      ser-0.8.10_src
@@ -15,6 +15,8 @@
 USE_BUILDLINK2=        YES
 USE_GMAKE=     YES
 
+MAKE_ENV+= BUILDLINK_PREFIX.pthread="${BUILDLINK_PREFIX.pthread}"
+
 .include "../../databases/mysql-client/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
diff -r 60b0d735ef47 -r 173ca29f18a9 chat/ser/distinfo
--- a/chat/ser/distinfo Thu Aug 28 03:50:15 2003 +0000
+++ b/chat/ser/distinfo Thu Aug 28 04:13:10 2003 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/08/23 22:08:02 itojun Exp $
+$NetBSD: distinfo,v 1.2 2003/08/28 04:13:10 jmc Exp $
 
 SHA1 (ser-0.8.10_src.tar.gz) = d3e88ff5eccf1c77b5b21637dd7c1ad3068ae89d
 Size (ser-0.8.10_src.tar.gz) = 931150 bytes
-SHA1 (patch-aa) = e0ed6ac17bc130a0869d9a60355fa9378e754470
+SHA1 (patch-aa) = f4287e4bb456faccfc0c2e4aaef7dfd69bdf3445
 SHA1 (patch-ab) = 38864b4c499fe838d4f8e752e0b73d8ab5bf252b
 SHA1 (patch-ac) = a1869650cfd00293b1bfd71f071e06563aad8c93
diff -r 60b0d735ef47 -r 173ca29f18a9 chat/ser/patches/patch-aa
--- a/chat/ser/patches/patch-aa Thu Aug 28 03:50:15 2003 +0000
+++ b/chat/ser/patches/patch-aa Thu Aug 28 04:13:10 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/08/23 22:08:03 itojun Exp $
+$NetBSD: patch-aa,v 1.2 2003/08/28 04:13:10 jmc Exp $
 
---- Makefile.defs-     2003-08-24 06:32:08.000000000 +0900
-+++ Makefile.defs      2003-08-24 06:32:33.000000000 +0900
-@@ -16,14 +16,13 @@
+--- Makefile.defs.orig Tue Nov 12 17:21:28 2002
++++ Makefile.defs      Wed Aug 27 22:41:18 2003
+@@ -16,7 +16,6 @@
                        -e s/armv4l/arm/)
  
   # install location
@@ -10,14 +10,6 @@
  prefix = $(PREFIX)
  # install path is $(basedir) $(prefix) 
  # example:
- #  creating a bin. archive in /tmp, which unpacks in /usr/local
- #  basedir=/tmp
- #  prefix=/usr/local
--basedir = 
-+basedir = 
- # install prefixes for various stuff
- cfg-prefix = $(basedir)$(prefix)
- bin-prefix = $(basedir)$(prefix)
 @@ -33,7 +32,7 @@
  ut-prefix = $(basedir)$(prefix)
  
@@ -36,7 +28,26 @@
  modules-target = $(prefix)/$(modules-dir)
  
  
-@@ -520,7 +519,7 @@
+@@ -446,6 +445,7 @@
+ endif
+ 
+ endif #mode=release
++LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib
+ 
+ 
+ #*FLAGS used for compiling the modules
+@@ -473,8 +473,10 @@
+       DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN
+ endif
+ ifneq ($(OS), openbsd)
++ifneq ($(OS), netbsd)
+       DEFS+=-DHAVE_SCHED_YIELD
+ endif
++endif
+ 
+ 
+ #os specific stuff
+@@ -520,7 +522,7 @@
  ifeq ($(OS), netbsd)
        DEFS+=-DHAVE_SOCKADDR_SA_LEN
        YACC=yacc



Home | Main Index | Thread Index | Old Index