1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-15 23:50:44 +00:00
freebsd-ports/x11-toolkits/qt31/files/patch-aa
R. Imura ff061bc917 Update to Qt Free Edition version 2.1.0 Beta 2.
1) Bump lib's version, since qt-2.1.0 loses lower compatibility
   with qt-2.0.2 but has only upper compatibility. (new qt binary
   does not work with old qt library)

2) Install libqgl.a (it works with its examples) in addition to libqt,
   so added LIB_DEPENDS to MesaGL.

3) JPEG support from extension had been included to the main library.

4) 'examples' and 'tutorials' are no longer built with port building,
   since they are never installed. If you want them, set
   QTDIR=/usr/ports/x11-toolkits/qt21/work and just type 'gmake' in each
   directories.

Some ideas obtained from qt145. :)
2000-03-06 18:24:03 +00:00

53 lines
2.0 KiB
Plaintext

--- configs/freebsd-g++-shared.orig Thu Feb 17 01:55:56 2000
+++ configs/freebsd-g++-shared Sat Feb 26 20:25:51 2000
@@ -16,7 +16,7 @@
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
# Qt, Qt+OpenGL
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
-SYSCONF_LIBS_QT = -lqt
+SYSCONF_LIBS_QT = -lqt2
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
@@ -27,7 +27,7 @@
# Linking applications
SYSCONF_LINK = g++
SYSCONF_LFLAGS =
-SYSCONF_LIBS =
+SYSCONF_LIBS = -lxpg4
# Link flags shared objects
SYSCONF_LFLAGS_SHOBJ = -shared
@@ -41,16 +41,26 @@
# - 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)
+ifeq ($(PORTOBJFORMAT),elf)
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
$(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+ -Wl,-soname,$(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)
+ rm -f lib$(TARGET).so; \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
+else
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)$(VER_PATCH)
+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
+ $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+ $(OBJECTS) $(OBJMOC) $(LIBS) && \
+ mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+ cd $(DESTDIR) && \
+ rm -f lib$(TARGET).so; \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
+endif
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a