head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.28 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.26 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.24 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.22 pkgsrc-2011Q2-base:1.9 pkgsrc-2009Q4:1.9.0.20 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.18 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.16 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.14 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.12 pkgsrc-2008Q2-base:1.9 pkgsrc-2008Q1:1.9.0.10 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.8 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.6 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.4 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.2 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.8.0.10 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.8 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.6 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.4 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.2 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.7.0.2 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.6.0.2 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.4.0.6 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.4 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.2 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.9 date 2007.03.23.06.26.19; author wiz; state dead; branches; next 1.8; 1.8 date 2005.12.13.19.51.44; author joerg; state Exp; branches; next 1.7; 1.7 date 2005.09.08.18.13.48; author drochner; state Exp; branches; next 1.6; 1.6 date 2005.06.18.12.39.52; author hira; state Exp; branches; next 1.5; 1.5 date 2005.06.18.05.57.05; author hira; state Exp; branches; next 1.4; 1.4 date 2004.08.27.06.29.07; author jlam; state Exp; branches; next 1.3; 1.3 date 2003.09.16.14.51.18; author agc; state Exp; branches; next 1.2; 1.2 date 2003.08.28.04.13.10; author jmc; state Exp; branches; next 1.1; 1.1 date 2003.08.23.22.08.03; author itojun; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2003.08.23.22.08.03; author itojun; state Exp; branches; next ; desc @@ 1.9 log @Complete move of chat/ser to net/ser. Addresses PR 36059. @ text @$NetBSD: patch-aa,v 1.8 2005/12/13 19:51:44 joerg Exp $ --- Makefile.defs.orig 2004-07-27 11:38:33.000000000 +0000 +++ Makefile.defs @@@@ -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) @@@@ -85,7 +85,8 @@@@ 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 ($(OS), linux) @@@@ -104,6 +105,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 +120,10 @@@@ 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 +139,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}") @@@@ -639,6 +645,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 +750,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.8 log @Add DragonFly support. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @update to 0.8.14 this is basically a maintainance release also fix doc location, closes PR pkg/31052 by Matthew Luckie @ text @d3 1 a3 1 --- Makefile.defs.orig 2004-07-27 13:38:33.000000000 +0200 d24 12 a35 1 @@@@ -117,7 +118,7 @@@@ endif d37 3 d47 1 a47 1 @@@@ -133,10 +134,10 @@@@ endif d62 1 a62 1 @@@@ -639,6 +640,7 @@@@ ifeq ($(CC_NAME), suncc) d70 20 @ 1.6 log @ Fix previous: correct path of config file. @ text @d3 12 a14 11 --- Makefile.defs.orig 2002-11-13 02:21:28.000000000 +0900 +++ Makefile.defs 2005-06-18 21:32:06.000000000 +0900 @@@@ -16,7 +16,6 @@@@ -e s/armv4l/arm/) # install location -PREFIX = /usr/local prefix = $(PREFIX) # install path is $(basedir) $(prefix) # example: @@@@ -33,7 +32,8 @@@@ d24 1 a24 1 @@@@ -45,7 +45,7 @@@@ d33 3 a35 3 @@@@ -59,10 +59,10 @@@@ endif d48 1 a48 1 @@@@ -446,6 +446,7 @@@@ a55 20 @@@@ -473,8 +474,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 +523,7 @@@@ ifeq ($(OS), netbsd) DEFS+=-DHAVE_SOCKADDR_SA_LEN YACC=yacc - LIBS= -lfl -lc_r + LIBS= -lfl -lpthread endif ifneq (,$(findstring CYGWIN, $(OS))) @ 1.5 log @ Use PKG_SYSCONFDIR framework. Bump PKGREVISION. This closes PR pkg/30546. @ text @d4 1 a4 1 +++ Makefile.defs 2005-06-18 11:11:16.000000000 +0900 d28 1 a28 1 +cfg-target = $(PKG_SYSCONFDIR)/$(cfg-dir) @ 1.4 log @Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG, which are the full option names used to set rpath directives for the linker and the compiler, respectively. In places were we are invoking the linker, use "${LINKER_RPATH_FLAG} ", where the space is inserted in case the flag is a word, e.g. -rpath. The default values of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the compiler that you use. They may be overridden on a ${OPSYS}-specific basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG, respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2003/09/16 14:51:18 agc Exp $ d3 2 a4 2 --- Makefile.defs.orig 2002-11-12 17:21:28.000000000 +0000 +++ Makefile.defs 2003-09-16 15:42:29.000000000 +0100 d13 1 a13 1 @@@@ -33,7 +32,7 @@@@ d19 1 d23 1 a23 1 @@@@ -45,7 +44,7 @@@@ d32 1 a32 1 @@@@ -59,10 +58,10 @@@@ d47 1 a47 1 @@@@ -446,6 +445,7 @@@@ d55 1 a55 1 @@@@ -473,8 +473,10 @@@@ d66 1 a66 1 @@@@ -520,7 +522,7 @@@@ @ 1.3 log @Sync PLIST with reality. Install files properly, so that a "make install; make deinstall; make install" combination does the right thing. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2003/08/28 04:13:10 jmc Exp $ d50 1 a50 1 +LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib @ 1.2 log @Various fixes so this works on 1.6.1 @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2003/08/23 22:08:03 itojun Exp $ d3 2 a4 2 --- Makefile.defs.orig Tue Nov 12 17:21:28 2002 +++ Makefile.defs Wed Aug 27 22:41:18 2003 d31 15 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- Makefile.defs- 2003-08-24 06:32:08.000000000 +0900 +++ Makefile.defs 2003-08-24 06:32:33.000000000 +0900 @@@@ -16,14 +16,13 @@@@ a12 8 # 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) d31 20 a50 1 @@@@ -520,7 +519,7 @@@@ @ 1.1.1.1 log @SIP Express Router 0.8.10 from iptel.org @ text @@