[BACK]Return to patch-ab CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / mbone / mdp / patches

File: [cvs.NetBSD.org] / pkgsrc / mbone / mdp / patches / patch-ab (download)

Revision 1.4, Sat Dec 1 13:55:12 2007 UTC (13 years, 1 month ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, cwrapper, cube-native-xorg-base, cube-native-xorg, HEAD
Changes since 1.3: +4 -3 lines

Restructured the package so that all source files can be patched.

Fixed build failures with g++4.

$NetBSD: patch-ab,v 1.4 2007/12/01 13:55:12 rillig Exp $

--- unix/Makefile.netbsd.orig	2002-01-08 06:18:57.000000000 +1100
+++ unix/Makefile.netbsd	2003-10-10 13:25:32.000000000 +1000
@@ -10,26 +10,26 @@
 
 # 1) Where to find the Tcl standard library scripts
 #    (e.g. init.tcl, ...)
-TCL_SCRIPT_PATH = /usr/local/lib/tcl8.0
+TCL_SCRIPT_PATH = ${PREFIX}/lib/tcl8.0
 
 # 2) Where to find the Tk standard library scripts
 #    (e.g. button.tcl, entry.tcl, ...)
-TK_SCRIPT_PATH = /usr/local/lib/tk8.0
+TK_SCRIPT_PATH = ${PREFIX}/lib/tk8.0
 
 # 3) Where to find Tcl/Tk header files
 #    (e.g. tcl.h, tk.h, ...)
-TCL_INCL_PATH = -I/usr/local/include
+TCL_INCL_PATH = -I${PREFIX}/include
 
 # 4) Point to specific libtcl.a and libtk.a to use
-TCL_LIB = /usr/local/lib/libtcl80.a
-TK_LIB = /usr/local/lib/libtk80.a
+TCL_LIB = ${PREFIX}/lib/libtcl80.a
+TK_LIB = ${PREFIX}/lib/libtk80.a
 
 
 # 5) System specific additional libraries, include paths, etc
 #    (Where to find X11 libraries, etc)
 #
-SYSTEM_INCLUDES = -I/usr/X11R6/include 
-SYSTEM_LDFLAGS = -L/usr/X11R6/lib 
+SYSTEM_INCLUDES = -I${X11BASE}/include 
+SYSTEM_LDFLAGS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
 SYSTEM_LIBS =  
 
 # 6) System specific capabilities
@@ -62,8 +62,8 @@ SYSTEM_LIBS =  
 # (We export these for other Makefiles as needed)
 #
 
-export SYSTEM_HAVES =  -DHAVE_GETLOGIN -DHAVE_ASSERT -DHAVE_FLOCK -DHAVE_DIRFD $(DNETSEC) 
+export SYSTEM_HAVES =  -DHAVE_GETLOGIN -DHAVE_ASSERT -DHAVE_FLOCK -DHAVE_DIRFD $(DNETSEC) -D__socklen_t_defined=1
 
-export CC = gcc
+export CC = g++
 
 include Makefile.common