head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.102 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.100 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.98 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.96 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.94 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.92 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.90 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.88 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.86 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.84 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.82 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.80 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.78 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.76 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.74 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.72 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.70 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.68 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.66 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.64 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.62 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.60 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.58 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.54 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.34 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.56 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.52 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.50 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.48 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.46 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.44 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.42 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.40 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.38 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.36 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.32 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.30 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.28 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.26 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.24 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.22 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.20 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.18 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.16 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.14 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.12 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.10 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.8 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.6 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.4 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.2 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.4.0.20 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.18 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.16 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.14 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.12 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.10 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.8 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.6 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.4 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.2 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.3.0.22 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.20 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.18 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.16 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.14 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.12 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.10 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.8 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.6 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.4 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.2 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.2.0.12 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.10 pkgsrc-2008Q1:1.2.0.8 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.6 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.4 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.2 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.1.1.1.0.2 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-20070323:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2013.09.10.14.37.50; author joerg; state Exp; branches; next 1.4; commitid FlayMLuff1yqUT4x; 1.4 date 2011.03.20.11.46.34; author obache; state Exp; branches; next 1.3; 1.3 date 2008.08.17.22.40.26; author dholland; state Exp; branches; next 1.2; 1.2 date 2007.05.31.04.22.10; author rillig; state Exp; branches; next 1.1; 1.1 date 2007.03.23.06.24.49; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2007.03.23.06.24.49; author wiz; state Exp; branches; next ; desc @@ 1.5 log @Recognize clang. @ text @$NetBSD: patch-aa,v 1.4 2011/03/20 11:46:34 obache Exp $ --- Makefile.defs.orig 2004-07-27 11:38:33.000000000 +0000 +++ Makefile.defs @@@@ -85,9 +85,14 @@@@ man-prefix = $(basedir)$(prefix) ut-prefix = $(basedir)$(prefix) # dirs -cfg-dir = etc/ser/ +cfg-dir = ser/ +eg-dir = $(EGDIR)/ bin-dir = sbin/ modules-dir = lib/ser/modules/ +ifeq (1, 1) + doc-dir = share/doc/ser + man-dir = $(PKGMANDIR) +else ifeq ($(OS), linux) doc-dir = share/doc/ser/ man-dir = share/man/ @@@@ -104,6 +109,10 @@@@ ifeq ($(OS), netbsd) doc-dir = share/doc/ser man-dir = man/ else +ifeq ($(OS), dragonfly) + doc-dir = share/doc/ser + man-dir = man/ +else ifeq ($(OS), darwin) doc-dir = share/doc/ser/ man-dir = man/ @@@@ -115,9 +124,11 @@@@ endif endif endif endif +endif +endif ut-prefix = bin/ # target dirs for various stuff -cfg-target = $(prefix)/$(cfg-dir) +cfg-target = $(PKG_SYSCONFDIR)/ modules-target = $(prefix)/$(modules-dir) @@@@ -133,10 +144,10 @@@@ endif INSTALL-TOUCH = touch # used to create the file first (good to # make solaris install work) # INSTALL-CFG = $(INSTALL) -m 644 -INSTALL-BIN = $(INSTALL) -m 755 -INSTALL-MODULES = $(INSTALL) -m 755 -INSTALL-DOC = $(INSTALL) -m 644 -INSTALL-MAN = $(INSTALL) -m 644 +INSTALL-BIN = $(INSTALL) -c -m 755 +INSTALL-MODULES = $(INSTALL) -c -m 755 +INSTALL-DOC = $(INSTALL) -c -m 644 +INSTALL-MAN = $(INSTALL) -c -m 644 #set some vars from the environment (and not make builtins) CC := $(shell echo "$${CC}") @@@@ -173,6 +184,19 @@@@ ifneq (,$(findstring gcc, $(CC_LONGVER)) 's/3\../3.0/') endif +ifneq (,$(findstring clang, $(CC_LONGVER))) + CC_NAME=gcc + CC_VER=$(CC) $(shell $(CC) --version|head -n 1| \ + 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/') + # sun sed is a little brain damaged => this complicated expression + MKDEP=$(CC) -MM + #transform gcc version into 2.9x or 3.0 + CC_SHORTVER=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \ + sed -e 's/[^0-9]*-\(.*\)/\1/'| \ + sed -e 's/2\.9.*/2.9x/' -e 's/3\..\..*/3.0/' -e \ + 's/3\../3.0/') +endif + ifneq (, $(findstring Sun, $(CC_LONGVER))) CC_NAME=suncc CC_SHORTVER=$(shell echo "$(CC_LONGVER)"|head -n 1| \ @@@@ -384,6 +408,10 @@@@ ifeq ($(ARCH), i386) use_fast_lock=yes endif +ifeq ($(ARCH), amd64) + use_fast_lock=yes +endif + ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) use_fast_lock=yes @@@@ -639,6 +667,7 @@@@ ifeq ($(CC_NAME), suncc) endif endif #mode=release +LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib #*FLAGS used for compiling the modules @@@@ -743,6 +772,19 @@@@ ifeq ($(OS), netbsd) LIBS= -lfl endif +ifeq ($(OS), dragonfly) + DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \ + -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL + ifneq ($(found_lock_method), yes) + DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems + found_lock_method=yes + LIBS= -pthread -lfl #dlopen is in libc + else + LIBS= -lfl #dlopen is in libc + endif + YACC=yacc +endif + # OS X support, same as freebsd ifeq ($(OS), darwin) DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \ @ 1.4 log @* LICENSE=gnu-gpl-v2 * add user-destdir installation support @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2008/08/17 22:40:26 dholland Exp $ d60 21 a80 1 @@@@ -384,6 +395,10 @@@@ ifeq ($(ARCH), i386) d91 1 a91 1 @@@@ -639,6 +654,7 @@@@ ifeq ($(CC_NAME), suncc) d99 1 a99 1 @@@@ -743,6 +759,19 @@@@ ifeq ($(OS), netbsd) @ 1.3 log @Add assembler bits for locking on amd64. Fixes broken build, because one of the modules doesn't compile against the portable locking code. Doesn't affect other platforms, so no revision bump. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2007/05/31 04:22:10 rillig Exp $ d3 2 a4 11 --- Makefile.defs.orig 2004-07-27 07:38:33.000000000 -0400 +++ Makefile.defs 2008-08-17 18:34:04.000000000 -0400 @@@@ -77,7 +77,7 @@@@ prefix = $(PREFIX) BASEDIR ?= basedir = $(BASEDIR) # install prefixes for various stuff -cfg-prefix = $(basedir)$(prefix) +cfg-prefix = $(basedir)$(prefix)/share/examples bin-prefix = $(basedir)$(prefix) modules-prefix = $(basedir)$(prefix) doc-prefix = $(basedir)$(prefix) @ 1.2 log @In pkgsrc, the directory layout does not depend on the operating system. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $ d3 2 a4 2 --- Makefile.defs.orig 2004-07-27 13:38:33.000000000 +0200 +++ Makefile.defs 2007-05-31 06:17:16.000000000 +0200 d69 12 a80 1 @@@@ -639,6 +650,7 @@@@ ifeq ($(CC_NAME), suncc) d88 1 a88 1 @@@@ -743,6 +755,19 @@@@ ifeq ($(OS), netbsd) @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2005/12/13 19:51:44 joerg Exp $ d3 2 a4 2 --- Makefile.defs.orig 2004-07-27 11:38:33.000000000 +0000 +++ Makefile.defs d14 1 a14 1 @@@@ -85,7 +85,8 @@@@ man-prefix = $(basedir)$(prefix) d23 4 d28 3 a30 1 @@@@ -104,6 +105,10 @@@@ ifeq ($(OS), netbsd) d41 1 a41 1 @@@@ -115,9 +120,10 @@@@ endif d46 1 d54 1 a54 1 @@@@ -133,10 +139,10 @@@@ endif d69 1 a69 1 @@@@ -639,6 +645,7 @@@@ ifeq ($(CC_NAME), suncc) d77 1 a77 1 @@@@ -743,6 +750,19 @@@@ ifeq ($(OS), netbsd) @ 1.1.1.1 log @Reimport chat/ser as net/ser, since that's a better fit. Addresses PR 36059. @ text @@