Return to patch-ab CVS log

Up to [cvs.NetBSD.org] / pkgsrc / mbone / mdp / patches

Annotation of pkgsrc/mbone/mdp/patches/patch-ab, Revision 1.4

1.4     ! rillig      1: $NetBSD: patch-ab,v 1.3 2003/10/18 13:20:32 cjep Exp $
        !             2:
        !             3: --- unix/Makefile.netbsd.orig  2002-01-08 06:18:57.000000000 +1100
        !             4: +++ unix/Makefile.netbsd       2003-10-10 13:25:32.000000000 +1000
1.1       agc         5: @@ -10,26 +10,26 @@
                      6:
                      7:  # 1) Where to find the Tcl standard library scripts
                      8:  #    (e.g. init.tcl, ...)
                      9: -TCL_SCRIPT_PATH = /usr/local/lib/tcl8.0
                     10: +TCL_SCRIPT_PATH = ${PREFIX}/lib/tcl8.0
                     11:
                     12:  # 2) Where to find the Tk standard library scripts
                     13:  #    (e.g. button.tcl, entry.tcl, ...)
                     14: -TK_SCRIPT_PATH = /usr/local/lib/tk8.0
                     15: +TK_SCRIPT_PATH = ${PREFIX}/lib/tk8.0
                     16:
                     17:  # 3) Where to find Tcl/Tk header files
                     18:  #    (e.g. tcl.h, tk.h, ...)
                     19: -TCL_INCL_PATH = -I/usr/local/include
                     20: +TCL_INCL_PATH = -I${PREFIX}/include
                     21:
                     22:  # 4) Point to specific libtcl.a and libtk.a to use
                     23: -TCL_LIB = /usr/local/lib/libtcl80.a
                     24: -TK_LIB = /usr/local/lib/libtk80.a
                     25: +TCL_LIB = ${PREFIX}/lib/libtcl80.a
                     26: +TK_LIB = ${PREFIX}/lib/libtk80.a
                     27:
                     28:
                     29:  # 5) System specific additional libraries, include paths, etc
                     30:  #    (Where to find X11 libraries, etc)
                     31:  #
                     32: -SYSTEM_INCLUDES = -I/usr/X11R6/include
                     33: -SYSTEM_LDFLAGS = -L/usr/X11R6/lib
                     34: +SYSTEM_INCLUDES = -I${X11BASE}/include
                     35: +SYSTEM_LDFLAGS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
                     36:  SYSTEM_LIBS =
                     37:
                     38:  # 6) System specific capabilities
1.2       rtr        39: @@ -62,8 +62,8 @@ SYSTEM_LIBS =
1.1       agc        40:  # (We export these for other Makefiles as needed)
                     41:  #
                     42:
                     43: -export SYSTEM_HAVES =  -DHAVE_GETLOGIN -DHAVE_ASSERT -DHAVE_FLOCK -DHAVE_DIRFD $(DNETSEC)
                     44: +export SYSTEM_HAVES =  -DHAVE_GETLOGIN -DHAVE_ASSERT -DHAVE_FLOCK -DHAVE_DIRFD $(DNETSEC) -D__socklen_t_defined=1
                     45:
1.2       rtr        46: -export CC = gcc
                     47: +export CC = g++
1.1       agc        48:
1.2       rtr        49:  include Makefile.common