head 1.5; access; symbols pkgsrc-2014Q4:1.4.0.76 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.74 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.72 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.70 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.68 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.66 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.64 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.62 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.60 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.58 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.56 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.54 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.52 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.50 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.48 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.46 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.44 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.42 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.40 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.38 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.36 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.34 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.32 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.30 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.28 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.26 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.24 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.22 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.20 pkgsrc-2008Q1:1.4.0.18 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.16 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.14 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.12 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.10 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.8 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.6 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.5 date 2015.01.11.02.37.20; author joerg; state dead; branches; next 1.4; commitid iSEVTk9aM40Hey5y; 1.4 date 2006.01.09.13.13.53; author joerg; state Exp; branches; next 1.3; 1.3 date 2005.12.12.19.55.41; author joerg; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2001.09.08.20.03.44; author jlam; state Exp; branches; next 1.1; 1.1 date 2001.04.05.14.06.57; author wiz; state Exp; branches; next ; 1.3.2.1 date 2006.01.10.15.02.18; author salo; state Exp; branches; next ; desc @@ 1.5 log @Retire x11/openmotif. @ text @$NetBSD: patch-ae,v 1.4 2006/01/09 13:13:53 joerg Exp $ --- clients/uil/UilDB.c.orig 2005-11-25 10:43:27.000000000 +0100 +++ clients/uil/UilDB.c @@@@ -79,8 +79,17 @@@@ static char rcsid[] = "$XConsortium: Uil #include #endif - - +#if defined(__NetBSD__) +#include +# if __NetBSD_Version__ >= 299001000 /* NetBSD 2.99.10 has getpw*_r*/ +# if !defined(_POSIX_THREAD_SAFE_FUNCTIONS) +# define _POSIX_THREAD_SAFE_FUNCTIONS 200112L +# endif +# else +# define XNO_MTSAFE_PWDAPI +# endif +#endif + #include "UilDefI.h" @ 1.4 log @Fix build on NetBSD systems: If we have NetBSD 2.99.10 and higher, getpwuid_r and friends exist, but _PTHREAD_THREAD_SAFE_FUNCTIONS might not be defined. Define it. For NetBSD before 2.99.10, explicitly set XNO_MTSAFE_PWDAPI to enforce locked access via normal functions. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2005/12/12 19:55:41 joerg Exp $ @ 1.3 log @Update OpenMotif to 2.2.3. Too many changes to list here, but most importantly no more imake usage. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -79,8 +79,9 @@@@ static char rcsid[] = "$XConsortium: Uil d11 9 a19 2 +#if defined(__NetBSD__) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS) +#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L d21 1 @ 1.3.2.1 log @Pullup ticket 1009 - requested by Joerg Sonnenberger build fix for openmotif Revisions pulled up: - pkgsrc/x11/openmotif/distinfo 1.20, 1.21, 1.23 - pkgsrc/x11/openmotif/patches/patch-ac 1.4, 1.5, 1.6 - pkgsrc/x11/openmotif/patches/patch-ae 1.4 Module Name: pkgsrc Committed By: joerg Date: Wed Jan 4 15:20:45 UTC 2006 Modified Files: pkgsrc/x11/openmotif: distinfo pkgsrc/x11/openmotif/patches: patch-ac Log Message: getpwuid_r and friends only exist on NetBSD 2.99.10 and higher, so use them only on those systems. --- Module Name: pkgsrc Committed By: joerg Date: Wed Jan 4 15:53:15 UTC 2006 Modified Files: pkgsrc/x11/openmotif: distinfo pkgsrc/x11/openmotif/patches: patch-ac Log Message: Fix spelling. Found by wiz@@. --- Module Name: pkgsrc Committed By: joerg Date: Mon Jan 9 13:13:53 UTC 2006 Modified Files: pkgsrc/x11/openmotif: distinfo pkgsrc/x11/openmotif/patches: patch-ac patch-ae Log Message: Fix build on NetBSD systems: If we have NetBSD 2.99.10 and higher, getpwuid_r and friends exist, but _PTHREAD_THREAD_SAFE_FUNCTIONS might not be defined. Define it. For NetBSD before 2.99.10, explicitly set XNO_MTSAFE_PWDAPI to enforce locked access via normal functions. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.4 2006/01/09 13:13:53 joerg Exp $ d5 1 a5 1 @@@@ -79,8 +79,17 @@@@ static char rcsid[] = "$XConsortium: Uil d11 2 a12 9 +#if defined(__NetBSD__) +#include +# if __NetBSD_Version__ >= 299001000 /* NetBSD 2.99.10 has getpw*_r*/ +# if !defined(_POSIX_THREAD_SAFE_FUNCTIONS) +# define _POSIX_THREAD_SAFE_FUNCTIONS 200112L +# endif +# else +# define XNO_MTSAFE_PWDAPI +# endif a13 1 + @ 1.2 log @Fix OpenMotif package to not overwrite X11R6 files when installed without xpkgwedge. Also, OpenMotif can actually be installed into ${LOCALBASE} if xpkgwedge is installed. Use x11.buildlink.mk and mark as USE_BUILDLINK_ONLY, and add a buildlink.mk file for use by other package Makefiles. @ text @d3 4 a6 4 --- config/cf/bsdLib.rules.orig Sat Sep 8 03:07:54 2001 +++ config/cf/bsdLib.rules @@@@ -153,7 +153,7 @@@@ #define ShLibIncludeFile d8 9 a16 6 #ifndef SharedLibraryLoadFlags -#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIR) +#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIRPATH) #endif #ifndef PositionIndependentCFlags #define PositionIndependentCFlags -fPIC @ 1.1 log @Standardize patch file names. @ text @d1 1 a1 1 $NetBSD: patch-config-cf-Motif.rules,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ d3 4 a6 4 --- config/cf/Motif.rules.orig Sun Oct 29 15:34:02 2000 +++ config/cf/Motif.rules Sun Oct 29 15:34:14 2000 @@@@ -50,9 +50,10 @@@@ # define MotifIsTopLevelProject NO d8 6 a13 19 -/* Include the X11 project rules file. */ +#ifndef X11IsTopLevelProject +/* If we have not included X11.rules yet, do it now. */ #include - +#endif /* Use the in-tree Motif by default. */ #ifndef UseInstalledMotif @@@@ -698,7 +699,7 @@@@ #define Real_MessageCatalogRule(prefix) @@@@\ prefix.cat Concat(prefix,MsgCatI.h): @@@@\ $(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@@@\ - $(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg > $(MLOCSRC)/C/msg/prefix.msg @@@@\ + $(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg | sed '/^[ ]*$$/d' > $(MLOCSRC)/C/msg/prefix.msg @@@@\ $(GENCAT) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@@@\ @@@@\ includes:: prefix.cat Concat(prefix,MsgCatI.h) @@@@\ @