head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.32 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.30 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.28 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.26 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.24 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.22 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.20 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.18 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.16 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.14 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.12 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.10 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.8 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.6 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.18 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.16 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.14 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2006.09.27.15.18.17; author joerg; state dead; branches; next 1.2; 1.2 date 2004.03.28.22.06.15; author xtraeme; state Exp; branches; next 1.1; 1.1 date 2004.01.24.08.47.29; author xtraeme; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.01.24.08.47.29; author xtraeme; state Exp; branches; next ; desc @@ 1.3 log @Remove XFree86. @ text @$NetBSD: patch-af,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ --- config/cf/FreeBSD.cf.in.orig 2004-03-03 07:40:43.000000000 +0000 +++ config/cf/FreeBSD.cf.in 2004-03-03 07:44:05.000000000 +0000 @@@@ -190,11 +190,11 @@@@ # define CcCmd $(CLIENTENVSETUP) cc # define CplusplusCmd $(CLIENTENVSETUP) c++ #else -# define CcCmd cc -# define CplusplusCmd c++ +# define CcCmd @@@@PKGSRC_CC@@@@ +# define CplusplusCmd @@@@PKGSRC_CXX@@@@ #endif -#define CppCmd /usr/bin/cpp +#define CppCmd @@@@PKGSRC_CPP@@@@ #define PreProcessCmd CppCmd #define StandardCppOptions -traditional #define StandardCppDefines /**/ @@@@ -207,7 +207,7 @@@@ #else #define NoSystemWarn #endif -#define DefaultCCOptions -ansi -pedantic NoSystemWarn -Dasm=__asm \ +#define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm \ GccWarningOptions #endif #endif @@@@ -439,18 +439,8 @@@@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif -/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ -#ifndef DefaultGcc2i386Opt -#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) -#define DefaultGcc2i386Opt -O2 GccAliasingArgs -#endif -#endif - -#ifdef i386Architecture -# define OptimizedCDebugFlags DefaultGcc2i386Opt -#else -# define OptimizedCDebugFlags -O -#endif +#define DefaultGcc2i386Opt +#define OptimizedCDebugFlags @@@@PKGSRC_CFLAGS@@@@ #ifndef PreIncDir # define PreIncDir /usr/include @@@@ -476,7 +466,7 @@@@ * Compress manual pages */ #ifndef CompressManPages -# define CompressManPages YES +# define CompressManPages NO #endif #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) @ 1.2 log @Upgrade XFree86 packages to 4.4.0. To see a full list of changes, please review: http://xfree86.org/4.4.0/RELNOTES.html These packages has been tested under NetBSD 1.6/-current, FreeBSD 4.x/5.x, and GNU/Linux (i386) by Jeremy C. Reed, Michal Pasternak and myself. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 11 a13 9 Index: lib/X11/XlcDL.c =================================================================== RCS file: /home/ncvs/xfree/xc/lib/X11/XlcDL.c,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -u -r1.9 -r1.9.2.1 --- lib/X11/XlcDL.c 25 Nov 2002 14:04:53 -0000 1.9 +++ lib/X11/XlcDL.c 11 Mar 2003 23:18:49 -0000 1.9.2.1 @@@@ -406,7 +406,7 @@@@ d15 17 a31 13 if (lc_name == NULL) return (XLCd)NULL; - if (_XlcLocaleDirName(lc_dir, (char *)lc_name) == (char*)NULL) + if (_XlcLocaleDirName(lc_dir, BUFSIZE, (char *)lc_name) == (char*)NULL) return (XLCd)NULL; resolve_object(lc_dir, lc_name); @@@@ -452,7 +452,7 @@@@ lc_name = lcd->core->name; - if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return (XIM)0; + if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return (XIM)0; d33 23 a55 12 count = lc_count; for (; count-- > 0; objects_list++) { @@@@ -498,7 +498,7 @@@@ lc_name = lcd->core->name; - if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return False; + if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; count = lc_count; for (; count-- > 0; objects_list++) { @@@@ -543,7 +543,7 @@@@ d58 1 a58 70 lc_name = lcd->core->name; - if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return False; + if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; count = lc_count; for (; count-- > 0; objects_list++) { @@@@ -610,7 +610,7 @@@@ lc_name = lcd->core->name; - if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return (XOM)0; + if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return (XOM)0; count = lc_count; for (; count-- > 0; objects_list++) { Index: lib/X11/XlcPubI.h =================================================================== RCS file: /home/ncvs/xfree/xc/lib/X11/XlcPubI.h,v retrieving revision 3.9 retrieving revision 3.9.6.1 diff -u -u -r3.9 -r3.9.6.1 --- lib/X11/XlcPubI.h 16 Nov 2001 00:52:27 -0000 3.9 +++ lib/X11/XlcPubI.h 11 Mar 2003 23:18:49 -0000 3.9.6.1 @@@@ -217,6 +217,7 @@@@ extern char *_XlcLocaleDirName( #if NeedFunctionPrototypes char* /* dir_name */, + size_t, /* dir_len */ char* /* lc_name */ #endif ); Index: lib/X11/lcFile.c =================================================================== RCS file: /home/ncvs/xfree/xc/lib/X11/lcFile.c,v retrieving revision 3.30 retrieving revision 3.30.2.1 diff -u -u -r3.30 -r3.30.2.1 --- lib/X11/lcFile.c 25 Nov 2002 14:04:53 -0000 3.30 +++ lib/X11/lcFile.c 11 Mar 2003 23:18:49 -0000 3.30.2.1 @@@@ -429,8 +429,9 @@@@ } char * -_XlcLocaleDirName(dir_name, lc_name) +_XlcLocaleDirName(dir_name, dir_len, lc_name) char *dir_name; + size_t dir_len; char *lc_name; { char dir[PATH_MAX], buf[PATH_MAX], *name = NULL; @@@@ -486,9 +487,16 @@@@ target_dir = args[0]; target_name = lc_name; } - strcpy(dir_name, target_dir); - strcat(dir_name, "/"); - strcat(dir_name, target_name); + /* snprintf(dir_name, dir_len, "%s/%", target_dir, target_name); */ + strncpy(dir_name, target_dir, dir_len - 1); + if (strlen(target_dir) >= dir_len - 1) { + dir_name[dir_len - 1] = '\0'; + } else { + strcat(dir_name, "/"); + strncat(dir_name, target_name, dir_len - strlen(dir_name) - 1); + if (strlen(target_name) >= dir_len - strlen(dir_name) - 1) + dir_name[dir_len - 1] = '\0'; + } if (target_name != lc_name) Xfree(target_name); return dir_name; @ 1.1.1.1 log @Initial import of XFree86-libs-4.3.0 from pkgsrc-wip. This package contains the XFree86 include header files and shared library files. @ text @@