head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.2 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.5.0.126 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.124 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.122 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.120 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.118 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.116 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.114 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.112 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.110 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.108 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.106 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.104 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.102 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.100 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.98 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.96 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.94 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.92 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.90 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.88 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.86 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.84 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.80 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.60 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.82 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.78 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.76 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.74 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.72 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.70 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.68 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.66 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.64 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.62 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.58 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.56 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.54 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.52 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.50 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.48 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.46 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.44 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.42 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.40 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.38 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.36 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.34 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.32 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.30 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.28 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.26 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.24 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.22 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.20 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.18 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.16 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.14 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.12 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.10 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.8 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.6 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.4 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.2 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.4.0.32 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.30 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.28 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.26 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.24 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.22 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.20 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.18 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.16 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.14 pkgsrc-2008Q1:1.4.0.12 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.10 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.8 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.6 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.4 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.2 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.3.0.26 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.24 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.22 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.20 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.18 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.16 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.14 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.12 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.10 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.8 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.6 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.4 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 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 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1; locks; strict; comment @# @; 1.6 date 2026.01.03.22.37.32; author wiz; state Exp; branches; next 1.5; commitid vA3voxI9MoTWYZoG; 1.5 date 2010.06.25.21.05.57; author joerg; state Exp; branches; next 1.4; 1.4 date 2006.10.09.20.04.38; author mlelstv; state Exp; branches; next 1.3; 1.3 date 2002.09.23.09.28.48; author jlam; state Exp; branches; next 1.2; 1.2 date 2002.02.27.17.14.28; author jlam; state Exp; branches; next 1.1; 1.1 date 99.10.01.17.05.15; author dmcmahill; state Exp; branches; next ; desc @@ 1.6 log @spice: fix build on NetBSD-current @ text @$NetBSD: patch-ag,v 1.5 2010/06/25 21:05:57 joerg Exp $ --- conf/defaults.orig Thu Jul 29 17:33:56 1993 +++ conf/defaults @@@@ -65,7 +65,7 @@@@ # the following definition: # SYS_DIR = $(DIST_DIR) -SYS_DIR = $(TOP1)/$(SYSTEM) +SYS_DIR = $(TOP0)/$(SYSTEM) # OBJ_TOP is the directory in which intermidiate files reside # These are ".o" files, synthesized ".c" files, ".a" files, @@@@ -105,12 +105,12 @@@@ # identified as and SYSTEM is the name of the per-system definitions # file listed on the "build" command line. -SPICE_DIR = $(TOP1)/$(SYSTEM) -SPICE_LIB_DIR = $(SPICE_DIR)/lib +SPICE_DIR = ${DESTDIR}@@PREFIX@@ +SPICE_LIB_DIR = $(SPICE_DIR)/share/spice3 SPICE_EXEC_DIR = $(SPICE_DIR)/bin S_SPICE_DIR = $(SPICE_DIR) -S_SPICE_LIB_DIR = $(S_SPICE_DIR)/lib +S_SPICE_LIB_DIR = $(S_SPICE_DIR)/share/spice3 S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin # INSTALL_DIRS lists the directories that need to be created before @@@@ -129,11 +129,11 @@@@ # an extra definition to work around the same strange bug. See either # file "conf/vax" or "conf/gcc". -CC = cc +CC = gcc # CC_OPT: Default compile options (optimization/debug level, other) -CC_OPT = -O +CC_OPT = -O2 -pipe # CC_OPT_SAFE: Special compile options to override CC_OPT for code # which typically causes problems for most compilers (bsim1 and bsim2). @@@@ -170,7 +170,7 @@@@ RANLIB = ranlib # spice3 source directory than in /tmp. Set to 'l' (lowercase 'L') # to use the source directory, otherwise leave blank. -ARLOCAL = l +ARLOCAL = # DEPEND_PROG is the command to generate dependencies from '.c' files # (for "make depend"). Output should be of the form "x11.o: fte.h". @@@@ -203,7 +203,7 @@@@ # X_DIR indicates the top of the X11 lib/include hierarchy; it is only # a convenience that is used in the following definitions. -X_DIR = /usr +X_DIR = @@X11BASE@@ # INCX lists the X include directories. This may be different between # MIT X11r5, X11r4, and your vendor's version of X11, though listing @@@@ -218,7 +218,7 @@@@ # which is not available with all versions of X11. If you do not have # it, then you do not need it (delete the following reference to it). -LIBX = -L$(X_DIR)/lib -lXaw -lXt -lXext -lXmu -lX11 +LIBX = -L$(X_DIR)/lib -Wl,-R@@X11BASE@@/lib -lXaw -lXt -lXext -lXmu -lSM -lICE -lX11 @ 1.5 log @DESTDIR support @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.4 2006/10/09 20:04:38 mlelstv Exp $ d44 9 @ 1.4 log @Make package compile with gcc-4. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.2 2002/02/27 17:14:28 jlam Exp $ d20 1 a20 1 +SPICE_DIR = @@PREFIX@@ @ 1.3 log @buildlink1 -> buildlink2 @ text @@ 1.2 log @* Strongly buildlinkify to handle readline wierdness. * Don't declare a bunch of extern functions that are already declared by system headers on NetBSD. XXX This change may be incorrect for non-current systems. @ text @d1 1 a1 1 $NetBSD$ d49 1 a49 1 +X_DIR = @@BUILDLINK_X11_DIR@@ @ 1.1 log @- added missing -Wl,-Rpath for the X11 libraries - fixed program version number reported when spice is run to make it consistent with the version of the program. - several patches to fix compilation warnings due to missing header files and some inconsistent variable types. - broke out previous patch-aa which patched several files into 1 patch per file. - fixed some code which returned the address of a local char array variable. - added GNU readline support (a huge improvement in the interface) - changed USE_X11BASE to USE_X11. No reason to install into X11BASE. - removed 'x' target from package Makefile @ text @d4 3 a6 2 +++ conf/defaults Wed Sep 29 21:30:44 1999 @@@@ -66,5 +66,5 @@@@ d13 3 a15 1 @@@@ -106,10 +106,10 @@@@ d20 1 a20 1 +SPICE_DIR = ${PREFIX} d29 3 a31 1 @@@@ -130,9 +130,9 @@@@ d43 3 a45 1 @@@@ -204,5 +204,5 @@@@ d49 1 a49 1 +X_DIR = ${X11BASE} d52 3 a54 1 @@@@ -219,5 +219,5 @@@@ d58 2 a59 1 +LIBX = -L$(X_DIR)/lib -Wl,-R$(X_DIR)/lib -lXaw -lXt -lXext -lXmu -lSM -lICE -lX11 @