head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.5.0.8
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2012Q4:1.5.0.6
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2011Q4:1.5.0.4
	pkgsrc-2011Q4-base:1.5
	pkgsrc-2011Q2:1.5.0.2
	pkgsrc-2011Q2-base:1.5
	pkgsrc-2010Q4:1.4.0.10
	pkgsrc-2010Q4-base:1.4
	pkgsrc-2010Q3:1.4.0.8
	pkgsrc-2010Q3-base:1.4
	pkgsrc-2010Q2:1.4.0.6
	pkgsrc-2010Q2-base:1.4
	pkgsrc-2010Q1:1.4.0.4
	pkgsrc-2010Q1-base:1.4
	pkgsrc-2009Q4:1.4.0.2
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2009Q3:1.3.0.32
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.30
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.28
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.26
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.24
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.22
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.20
	pkgsrc-2008Q2-base:1.3
	cwrapper:1.3.0.18
	pkgsrc-2008Q1:1.3.0.16
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.14
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.12
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.10
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.8
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.6
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.4
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.2
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.2.0.12
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.10
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.8
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.6
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.4
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.2
	pkgsrc-2004Q4-base:1.2;
locks; strict;
comment	@# @;


1.5
date	2011.03.06.16.02.33;	author wiz;	state dead;
branches;
next	1.4;

1.4
date	2010.01.04.17.59.49;	author joerg;	state Exp;
branches;
next	1.3;

1.3
date	2006.05.31.10.25.19;	author joerg;	state Exp;
branches;
next	1.2;

1.2
date	2004.11.09.12.38.10;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	2004.11.09.12.37.36;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Remove GTK1 using packages for which noone spoke up for the last two weeks
on pkgsrc-users in the thread "[HEADS UP] Package removal -- please check".
@
text
@$NetBSD: patch-ad,v 1.4 2010/01/04 17:59:49 joerg Exp $

--- SConstruct.orig	2004-05-20 14:03:14.000000000 +0000
+++ SConstruct
@@@@ -1,6 +1,8 @@@@
 import os
 import glob
 
+SConsignFile()
+
 opts = Options(	"my_options.py")
 
 opts.Add("qt_directory", "Path to Qt directory", "not specified")
@@@@ -18,10 +20,7 @@@@ opts.Add("add_lib_dirs", "A comma-separa
 opts.Add(BoolOption("maintainer_mode", "Whether you want to use some special ingredients", 0))
 
 env = Environment(
-    ENV = {
-      'PATH' : os.environ[ 'PATH' ],
-      'HOME' : os.environ[ 'HOME' ] # required for distcc
-    }, options = opts)
+    ENV = os.environ, options = opts)
 env.Replace(CPPPATH = [], LIBS = [], LIBPATH = [], CPPDEFINES = [],
     CXXFLAGS = "", CCFLAGS = "")
 Help(opts.GenerateHelpText(env))
@@@@ -112,7 +111,7 @@@@ def SplitLibs(lstring):
 def CheckForQtAt(context, qtdir):
   context.Message('Checking for Qt at %s... ' % qtdir)
   result = AttemptLinkWithVariables(context,
-      { "LIBS": "qt-mt", "LIBPATH": qtdir + '/lib', "CPPPATH": qtdir + '/include' },
+      { "LIBS": "qt-mt", "LIBPATH": qtdir + '/lib', "CPPPATH": qtdir + '/include', "LINKFLAGS": os.environ.get("PTHREAD_LDFLAGS","").split() + os.environ.get("PTHREAD_LIBS", "").split()},
       """
 #include <qapplication.h>
 int main(int argc, char **argv) { 
@


1.4
log
@Deal with the usual scons design nightmare and don't nuke the complete
environment.
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@Explicitly link with pthread, when using Qt.
@
text
@d14 13
a26 1
@@@@ -112,7 +114,7 @@@@ def SplitLibs(lstring):
@


1.2
log
@Add RCS Id.
@
text
@d2 3
a4 2
--- SConstruct.orig	2004-11-09 13:09:48.000000000 +0100
+++ SConstruct	2004-11-09 13:10:06.000000000 +0100
d14 9
@


1.1
log
@Make madman use the scons package instead of an included version of scons.
Also, stop scons from spreading .sconsign files around the file system.

From package maintainer Ove Soerensen in private mail.
@
text
@d1 1
@