Tue Sep 10 14:37:51 2013 UTC ()
Recognize clang.


(joerg)
diff -r1.5 -r1.6 pkgsrc/net/ser/distinfo
diff -r1.4 -r1.5 pkgsrc/net/ser/patches/patch-aa
cvs diff -r1.5 -r1.6 pkgsrc/net/ser/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ser/distinfo 2011/03/24 05:27:49 1.5
+++ pkgsrc/net/ser/distinfo 2013/09/10 14:37:50 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2011/03/24 05:27:49 obache Exp $ 1$NetBSD: distinfo,v 1.6 2013/09/10 14:37:50 joerg Exp $
2 2
3SHA1 (ser-0.8.14_src.tar.gz) = 91553951247506850d66da25819333b61b150d1d 3SHA1 (ser-0.8.14_src.tar.gz) = 91553951247506850d66da25819333b61b150d1d
4RMD160 (ser-0.8.14_src.tar.gz) = 72c3a0793f3dd88584ee65b3751ccf8a3776f840 4RMD160 (ser-0.8.14_src.tar.gz) = 72c3a0793f3dd88584ee65b3751ccf8a3776f840
5Size (ser-0.8.14_src.tar.gz) = 1551881 bytes 5Size (ser-0.8.14_src.tar.gz) = 1551881 bytes
6SHA1 (patch-aa) = 1bfb2ea58ab399b836a9f18a829fb51e6453b8e4 6SHA1 (patch-aa) = 95971192dea5bee4120b4db3b2f0c7810385bb6e
7SHA1 (patch-ab) = 871de5c826853381eb5b6889d8e3d8b2f310dc6b 7SHA1 (patch-ab) = 871de5c826853381eb5b6889d8e3d8b2f310dc6b
8SHA1 (patch-ac) = ece24eec7175c1396d76e2b85ff69a4b995e541e 8SHA1 (patch-ac) = ece24eec7175c1396d76e2b85ff69a4b995e541e
9SHA1 (patch-ad) = 54fc24c84cc4c3261f1b40faa2124ef5506e5e00 9SHA1 (patch-ad) = 54fc24c84cc4c3261f1b40faa2124ef5506e5e00
cvs diff -r1.4 -r1.5 pkgsrc/net/ser/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/ser/patches/patch-aa 2011/03/20 11:46:34 1.4
+++ pkgsrc/net/ser/patches/patch-aa 2013/09/10 14:37:50 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.4 2011/03/20 11:46:34 obache Exp $ 1$NetBSD: patch-aa,v 1.5 2013/09/10 14:37:50 joerg Exp $
2 2
3--- Makefile.defs.orig 2004-07-27 11:38:33.000000000 +0000 3--- Makefile.defs.orig 2004-07-27 11:38:33.000000000 +0000
4+++ Makefile.defs 4+++ Makefile.defs
5@@ -85,9 +85,14 @@ man-prefix = $(basedir)$(prefix) 5@@ -85,9 +85,14 @@ man-prefix = $(basedir)$(prefix)
6 ut-prefix = $(basedir)$(prefix) 6 ut-prefix = $(basedir)$(prefix)
7  7
8 # dirs 8 # dirs
9-cfg-dir = etc/ser/ 9-cfg-dir = etc/ser/
10+cfg-dir = ser/ 10+cfg-dir = ser/
11+eg-dir = $(EGDIR)/ 11+eg-dir = $(EGDIR)/
12 bin-dir = sbin/ 12 bin-dir = sbin/
13 modules-dir = lib/ser/modules/ 13 modules-dir = lib/ser/modules/
14+ifeq (1, 1) 14+ifeq (1, 1)
@@ -47,46 +47,66 @@ $NetBSD: patch-aa,v 1.4 2011/03/20 11:46 @@ -47,46 +47,66 @@ $NetBSD: patch-aa,v 1.4 2011/03/20 11:46
47 # make solaris install work) 47 # make solaris install work)
48 # INSTALL-CFG = $(INSTALL) -m 644 48 # INSTALL-CFG = $(INSTALL) -m 644
49-INSTALL-BIN = $(INSTALL) -m 755 49-INSTALL-BIN = $(INSTALL) -m 755
50-INSTALL-MODULES = $(INSTALL) -m 755 50-INSTALL-MODULES = $(INSTALL) -m 755
51-INSTALL-DOC = $(INSTALL) -m 644 51-INSTALL-DOC = $(INSTALL) -m 644
52-INSTALL-MAN = $(INSTALL) -m 644 52-INSTALL-MAN = $(INSTALL) -m 644
53+INSTALL-BIN = $(INSTALL) -c -m 755 53+INSTALL-BIN = $(INSTALL) -c -m 755
54+INSTALL-MODULES = $(INSTALL) -c -m 755 54+INSTALL-MODULES = $(INSTALL) -c -m 755
55+INSTALL-DOC = $(INSTALL) -c -m 644 55+INSTALL-DOC = $(INSTALL) -c -m 644
56+INSTALL-MAN = $(INSTALL) -c -m 644 56+INSTALL-MAN = $(INSTALL) -c -m 644
57  57
58 #set some vars from the environment (and not make builtins) 58 #set some vars from the environment (and not make builtins)
59 CC := $(shell echo "$${CC}") 59 CC := $(shell echo "$${CC}")
60@@ -384,6 +395,10 @@ ifeq ($(ARCH), i386) 60@@ -173,6 +184,19 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))
 61 's/3\../3.0/')
 62 endif
 63
 64+ifneq (,$(findstring clang, $(CC_LONGVER)))
 65+ CC_NAME=gcc
 66+ CC_VER=$(CC) $(shell $(CC) --version|head -n 1| \
 67+ sed -e 's/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/' -e 's/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
 68+ # sun sed is a little brain damaged => this complicated expression
 69+ MKDEP=$(CC) -MM
 70+ #transform gcc version into 2.9x or 3.0
 71+ CC_SHORTVER=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \
 72+ sed -e 's/[^0-9]*-\(.*\)/\1/'| \
 73+ sed -e 's/2\.9.*/2.9x/' -e 's/3\..\..*/3.0/' -e \
 74+ 's/3\../3.0/')
 75+endif
 76+
 77 ifneq (, $(findstring Sun, $(CC_LONGVER)))
 78 CC_NAME=suncc
 79 CC_SHORTVER=$(shell echo "$(CC_LONGVER)"|head -n 1| \
 80@@ -384,6 +408,10 @@ ifeq ($(ARCH), i386)
61 use_fast_lock=yes 81 use_fast_lock=yes
62 endif 82 endif
63  83
64+ifeq ($(ARCH), amd64) 84+ifeq ($(ARCH), amd64)
65+ use_fast_lock=yes 85+ use_fast_lock=yes
66+endif 86+endif
67+ 87+
68 ifeq ($(ARCH), sparc64) 88 ifeq ($(ARCH), sparc64)
69 ifeq ($(CC_NAME), gcc) 89 ifeq ($(CC_NAME), gcc)
70 use_fast_lock=yes 90 use_fast_lock=yes
71@@ -639,6 +654,7 @@ ifeq ($(CC_NAME), suncc) 91@@ -639,6 +667,7 @@ ifeq ($(CC_NAME), suncc)
72 endif 92 endif
73  93
74 endif #mode=release 94 endif #mode=release
75+LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib 95+LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib
76  96
77  97
78 #*FLAGS used for compiling the modules 98 #*FLAGS used for compiling the modules
79@@ -743,6 +759,19 @@ ifeq ($(OS), netbsd) 99@@ -743,6 +772,19 @@ ifeq ($(OS), netbsd)
80 LIBS= -lfl  100 LIBS= -lfl
81 endif 101 endif
82  102
83+ifeq ($(OS), dragonfly) 103+ifeq ($(OS), dragonfly)
84+ DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \ 104+ DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \
85+ -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL 105+ -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL
86+ ifneq ($(found_lock_method), yes) 106+ ifneq ($(found_lock_method), yes)
87+ DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems 107+ DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems
88+ found_lock_method=yes 108+ found_lock_method=yes
89+ LIBS= -pthread -lfl #dlopen is in libc 109+ LIBS= -pthread -lfl #dlopen is in libc
90+ else 110+ else
91+ LIBS= -lfl #dlopen is in libc 111+ LIBS= -lfl #dlopen is in libc
92+ endif 112+ endif