head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.14 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.12 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.10 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.8 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.6 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.4 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.2 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.7.0.24 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.22 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.20 pkgsrc-2008Q1:1.7.0.18 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.16 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.14 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.12 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.10 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.8 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.6 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.4 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.2 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.6.0.20 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.18 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.16 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.14 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.12 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.10 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.8 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.6 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.4 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.6.0.2 netbsd-1-6-1-base:1.6 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2008.09.16.16.07.33; author wiz; state dead; branches; next 1.7; 1.7 date 2006.01.05.21.22.14; author joerg; state Exp; branches; next 1.6; 1.6 date 2002.10.25.10.56.05; author bouyer; state Exp; branches; next 1.5; 1.5 date 2002.08.25.18.40.44; author jlam; state Exp; branches; next 1.4; 1.4 date 2001.08.29.22.41.30; author jlam; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2001.06.23.19.35.27; author jlam; state Exp; branches; next 1.2; 1.2 date 2000.12.05.18.32.05; author drochner; state Exp; branches; next 1.1; 1.1 date 2000.10.19.07.41.15; author skrll; state Exp; branches 1.1.1.1; next ; 1.4.2.1 date 2002.05.11.02.09.33; author jlam; state Exp; branches; next ; 1.1.1.1 date 2000.10.19.07.41.15; author skrll; state Exp; branches; next ; desc @@ 1.8 log @Remove remaining qt1 and qt2 packages, as announced on pkgsrc-users on Sep 7 2008. No complaints received. @ text @$NetBSD: patch-ac,v 1.7 2006/01/05 21:22:14 joerg Exp $ --- configs/solaris-g++-static.orig Wed Jun 13 10:56:50 2001 +++ configs/solaris-g++-static Thu Oct 17 18:28:26 2002 @@@@ -2,24 +2,25 @@@@ INTERFACE_DECL_PATH = . SYSCONF_CXX = g++ SYSCONF_CC = gcc +SYSCONF_CXX_LIB = $(LIBTOOL) --mode=compile g++ DASHCROSS = # Compiling with support libraries -SYSCONF_CXXFLAGS_X11 = -I/usr/openwin/include +SYSCONF_CXXFLAGS_X11 = -I@@X11BASE@@/include SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -SYSCONF_CXXFLAGS_OPENGL = +SYSCONF_CXXFLAGS_OPENGL = -I@@LOCALBASE@@/include -I@@X11BASE@@/include # Compiling YACC output SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses # Linking with support libraries -SYSCONF_RPATH_X11 = -Wl,-R,/usr/openwin/lib -SYSCONF_RPATH_QT = -Wl,-R,$(QTDIR)/lib -SYSCONF_RPATH_OPENGL = +SYSCONF_RPATH_X11 = -Wl,-R,@@X11BASE@@/lib +SYSCONF_RPATH_QT = -Wl,-R,@@QTDIR@@/lib +SYSCONF_RPATH_OPENGL = -Wl,-R@@X11BASE@@/lib -Wl,-R@@LOCALBASE@@/lib # Linking with support libraries # X11 -SYSCONF_LFLAGS_X11 = -L/usr/openwin/lib +SYSCONF_LFLAGS_X11 = -L@@X11BASE@@/lib SYSCONF_LIBS_X11 = -lXext -lX11 -lm -lresolv -lsocket -lnsl # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib @@@@ -26,13 +27,13 @@@@ SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) SYSCONF_LIBS_QT_OPENGL = # OpenGL -SYSCONF_LFLAGS_OPENGL = +SYSCONF_LFLAGS_OPENGL = -L@@LOCALBASE@@/lib -L@@X11BASE@@/lib SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu # Yacc SYSCONF_LIBS_YACC = # Linking applications -SYSCONF_LINK = g++ +SYSCONF_LINK = $(LIBTOOL) --mode=link g++ SYSCONF_LFLAGS = SYSCONF_LIBS = @@@@ -51,39 +52,22 @@@@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -# Linking shared libraries -# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 +# Linking libtool libraries +# - Build the $(TARGET) library, eg. lib$(TARGET).la # - Place target in $(DESTDIR) - which has a trailing / # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) # -SYSCONF_LINK_SHLIB = g++ -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) -SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -h $(TARGET1) \ - $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ - $(OBJECTS) $(OBJMOC) $(LIBS) && \ - mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ - cd $(DESTDIR) && \ - rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) - -# Linking static libraries -# - Build the $(TARGET) library, eg. lib$(TARGET).a -# - Place target in $(DESTDIR) - which has a trailing / -# -SYSCONF_AR = ar cq -SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a -SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ - $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) +SYSCONF_LINK_TARGET = lib$(TARGET).la +SYSCONF_LINK_LIB = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET); \ + $(SYSCONF_LINK) $(LFLAGS) -rpath $(QTPREFIX)/lib \ + -version-info $(VER_MAJ):$(VER_MIN) -o $(SYSCONF_LINK_TARGET) \ + $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS) # Compiling application source -SYSCONF_CXXFLAGS = -O2 -SYSCONF_CFLAGS = -O2 -SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) -SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) +#SYSCONF_CXXFLAGS = -O2 +#SYSCONF_CFLAGS = -O2 # Compiling library source -SYSCONF_CXXFLAGS_LIB = -SYSCONF_CFLAGS_LIB = +#SYSCONF_CXXFLAGS_LIB = +#SYSCONF_CFLAGS_LIB = # Compiling shared-object source SYSCONF_CXXFLAGS_SHOBJ = -fPIC SYSCONF_CFLAGS_SHOBJ = -fPIC @ 1.7 log @Use SUBST framework, patch files directly. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.6 2002/10/25 10:56:05 bouyer Exp $ @ 1.6 log @Don't depend on egcs for solaris, the gcc-2.95.3 provided with solaris9 works fine too. libtoolize the library builds for solaris, and build shared libraries. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2002/08/25 18:40:44 jlam Exp $ d3 2 a4 2 --- configs/solaris-g++-static.in.orig Wed Jun 13 10:56:50 2001 +++ configs/solaris-g++-static.in Thu Oct 17 18:28:26 2002 @ 1.5 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4.2.1 2002/05/11 02:09:33 jlam Exp $ d3 3 a5 3 --- configs/solaris-g++-static.in.orig Wed Jun 13 04:56:50 2001 +++ configs/solaris-g++-static.in @@@@ -2,31 +2,32 @@@@ d37 1 d46 43 a88 3 @@@@ -77,13 +78,13 @@@@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) d92 2 a95 2 SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) @ 1.4 log @Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references to ${X11BASE} in the header and library search paths into references to ${LOCALBASE}/share/x11-links. These packages should now be strongly- buildlinked regardless of whether xpkgwedge is installed. Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2001/06/23 19:35:27 jlam Exp $ d14 1 a14 1 +SYSCONF_CXXFLAGS_X11 = -I@@BUILDLINK_X11_DIR@@/include d17 1 a17 1 +SYSCONF_CXXFLAGS_OPENGL = -I@@BUILDLINK_DIR@@/include -I@@BUILDLINK_X11_DIR@@/include d33 1 a33 1 +SYSCONF_LFLAGS_X11 = -L@@BUILDLINK_X11_DIR@@/lib d41 1 a41 1 +SYSCONF_LFLAGS_OPENGL = -L@@BUILDLINK_DIR@@/lib -L@@BUILDLINK_X11_DIR@@/lib @ 1.4.2.1 log @First pass at conversion of various packages to use the buildlink2 framework. Add many buildlink2.mk files to add to the framework. Please see buildlink2.txt for more details. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2001/08/29 22:41:30 jlam Exp $ d14 1 a14 1 +SYSCONF_CXXFLAGS_X11 = -I@@X11BASE@@/include d17 1 a17 1 +SYSCONF_CXXFLAGS_OPENGL = -I@@LOCALBASE@@/include -I@@X11BASE@@/include d33 1 a33 1 +SYSCONF_LFLAGS_X11 = -L@@X11BASE@@/lib d41 1 a41 1 +SYSCONF_LFLAGS_OPENGL = -L@@LOCALBASE@@/lib -L@@X11BASE@@/lib @ 1.3 log @Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. Handle -L and rpath specifications in the config files by directly substituting their final values; this is needed since the configure script directly manipulates these values via sed and needs the substituted values, not just ${VAR}. Also honor CXXFLAGS passed in from the environment (possibly containing optimization flags) during the build. @ text @d1 1 a1 1 $NetBSD$ d14 1 a14 1 +SYSCONF_CXXFLAGS_X11 = -I@@X11BASE@@/include d17 1 a17 1 +SYSCONF_CXXFLAGS_OPENGL = -I@@BUILDLINK_DIR@@/include -I@@X11BASE@@/include d33 1 a33 1 +SYSCONF_LFLAGS_X11 = -L@@X11BASE@@/lib d41 1 a41 1 +SYSCONF_LFLAGS_OPENGL = -L@@BUILDLINK_DIR@@/lib -L@@X11BASE@@/lib @ 1.2 log @update to qt-2.2.2 "Bugfixes and minor extensions." @ text @d3 3 a5 3 --- configs/solaris-g++-static.orig Wed Nov 8 18:06:39 2000 +++ configs/solaris-g++-static Thu Nov 30 13:09:00 2000 @@@@ -2,6 +2,7 @@@@ d13 50 @ 1.1 log @Initial revision @ text @d3 2 a4 2 --- configs/solaris-g++-static.orig Wed Oct 4 10:55:31 2000 +++ configs/solaris-g++-static d10 1 a12 1 SYSCONF_CXXFLAGS_X11 = -I/usr/openwin/include @ 1.1.1.1 log @Import new qt-2.2.1 package. This is the base package that includes only the qt library. @ text @@