head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.166 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.164 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.162 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.160 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.158 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.156 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.154 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.152 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.150 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.148 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.146 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.144 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.142 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.140 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.138 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.136 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.134 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.132 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.130 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.128 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.126 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.124 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.122 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.118 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.98 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.120 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.116 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.114 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.112 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.110 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.108 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.106 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.104 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.102 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.100 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.96 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.94 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.92 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.90 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.88 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.86 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.84 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.82 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.80 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.78 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.76 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.74 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.72 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.70 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.68 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.66 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.64 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.62 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.60 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.58 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.56 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.54 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.52 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.50 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.46 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.44 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.42 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.40 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.38 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.36 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.34 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.32 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.30 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.28 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.26 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.24 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.22 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.20 pkgsrc-2008Q1:1.2.0.18 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.16 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.14 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.12 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.10 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.0.4 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.2 pkgsrc-2005Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2006.02.18.14.07.54; author joerg; state Exp; branches; next 1.1; 1.1 date 2005.09.18.21.18.53; author minskim; state Exp; branches; next ; desc @@ 1.2 log @Convert to libtool. Shared theme modules are named foo.theme.so by default, but foo.theme is tried afterwards as fallback. Bump revision. Discussed with jlam@@ @ text @$NetBSD$ --- src/Makefile.orig 2005-02-03 15:11:44.000000000 +0000 +++ src/Makefile @@@@ -42,7 +42,10 @@@@ OUT_MAGIC := $(shell mkdir $(EFLTK_TOPDI ################################################################ FLDIRS = core widgets db -DIRS = xml images opengl net +DIRS = xml images net +ifeq ($(HAVE_OPENGL),yes) +DIRS+= opengl +endif LIBNAME = libefltk DSOLIBNAME = $(LIBNAME) @@@@ -52,6 +55,18 @@@@ DSONAME = $(LIBNAME)$(DSOEXT) all: $(BUILDTARGETS) +libtool: + @@rm -f $(LIBRARY).la + @@for dir in $(FLDIRS); do\ + if test ! -f $$dir/makedepend; then touch $$dir/makedepend; fi;\ + (cd $$dir;$(MAKE) $(MFLAGS) libtool) || exit;\ + done + $(MAKE) $(LIBRARY).la + @@for dir in $(DIRS); do\ + if test ! -f $$dir/makedepend; then touch $$dir/makedepend; fi;\ + (cd $$dir;$(MAKE) $(MFLAGS) libtool) || exit;\ + done + static: @@rm -f $(LIBRARY)$(LIBEXT) @@for dir in $(FLDIRS); do\ @@@@ -80,12 +95,17 @@@@ programs: STATIC_OBJECTS = core/*.static.o widgets/*.static.o db/*.static.o SHARED_OBJECTS = core/*.shared.o widgets/*.shared.o db/*.shared.o +LIBTOOL_OBJECTS = core/*.lo widgets/*.lo db/*.lo $(LIBRARY).a: @@echo $(LIBCOMMAND) $@@ ... @@$(LIBCOMMAND) $@@ $(STATIC_OBJECTS) @@$(RANLIB) $@@ +${LIBRARY}.la: + ${LIBTOOL} --mode=link ${CXX} -o $@@ ${CXXFLAGS} ${LDFLAGS} \ + -rpath ${libdir} -version-info 2:0 ${LIBTOOL_OBJECTS} ${DSOLIBS} + $(DSO).so.$(FL_API_VERSION) $(DSO).sl.2: @@rm -f $@@ @@echo $(DSOCOMMAND) $(DSONAME) ... @@@@ -130,6 +150,15 @@@@ install_static: static (cd $$dir;$(MAKE) $(MFLAGS) install_static) || exit;\ done +install_libtool: libtool + @@echo "Installing libraries..." + ${BSD_INSTALL_DATA_DIR} $(libdir) + ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${LIBRARY}.la ${libdir} + @@for dir in $(DIRS) $(FLDIRS); do\ + if test ! -f $$dir/makedepend; then touch $$dir/makedepend; fi;\ + (cd $$dir;$(MAKE) $(MFLAGS) install_libtool) || exit;\ + done + install_shared: shared @@echo "Installing shared libraries..." @@rm -f $(libdir)/$(DLLIMPORTNAME) @ 1.1 log @Link shared libraries against pthread. This makes x11/ede build on NetBSD-1.6.2 and NetBSD 2.0. Bump PKGREVISION as well as BUILDLINK_DEPENDS since x11/ede is the only package depending on this. @ text @d3 1 a3 1 --- src/Makefile.orig 2005-02-03 07:11:44.000000000 -0800 d5 46 a50 1 @@@@ -89,7 +89,7 @@@@ $(LIBRARY).a: d54 16 a69 5 - @@$(DSOCOMMAND) $(DSONAME) $(SHARED_OBJECTS) $(DSOLIBS) + @@$(DSOCOMMAND) $(DSONAME) $(SHARED_OBJECTS) $(DSOLIBS) $(THREADSLIBS) $(COMPILER_RPATH_FLAG)$(PTHREADBASE)/lib ifneq ($(STRIP), ) @@$(STRIP) $(DSONAME) endif @