summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorskrll <skrll@pkgsrc.org>2000-07-06 19:04:50 +0000
committerskrll <skrll@pkgsrc.org>2000-07-06 19:04:50 +0000
commit7884988732109b7fc84cf20953fd63999558baee (patch)
tree15dbb4d1318f5ed3c50b55dc312135a6605a1685 /x11
parent6e8e892661ce4154c14f35ada922e02e1e7503e4 (diff)
downloadpkgsrc-7884988732109b7fc84cf20953fd63999558baee.tar.gz
Update to use USE_LIBTOOL and use QTPREFIX appropriately.
Diffstat (limited to 'x11')
-rw-r--r--x11/qt1/Makefile10
-rw-r--r--x11/qt1/files/patch-sum6
-rw-r--r--x11/qt1/patches/patch-aa18
-rw-r--r--x11/qt1/patches/patch-ac25
4 files changed, 33 insertions, 26 deletions
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile
index ce0bc4f1949..61d5e680a65 100644
--- a/x11/qt1/Makefile
+++ b/x11/qt1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:47 rh Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/06 19:04:50 skrll Exp $
#
DISTNAME= qt-1.44
@@ -12,9 +12,11 @@ HOMEPAGE= http://www.troll.no/products/qt.html
USE_X11BASE= yes
USE_GMAKE= yes
-USE_PKGLIBTOOL= yes
+USE_LIBTOOL= yes
-MAKE_ENV= QTDIR=${WRKSRC}
+QTPREFIX=${PREFIX}/qt1
+
+MAKE_ENV= QTDIR=${WRKSRC} QTPREFIX=${QTPREFIX}
ALL_TARGET= src
.include "../../mk/bsd.prefs.mk"
@@ -32,8 +34,6 @@ post-patch:
cd ${WRKSRC} && ${PATCH} <${FILESDIR}/enablegif.patch
.endif
-QTPREFIX=${PREFIX}/qt1
-
do-install:
${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin
diff --git a/x11/qt1/files/patch-sum b/x11/qt1/files/patch-sum
index 55c71a5cd7c..bf33cef7adf 100644
--- a/x11/qt1/files/patch-sum
+++ b/x11/qt1/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.3 2000/07/06 19:04:51 skrll Exp $
-MD5 (patch-aa) = 17727abcf4dc511832d1827d923e4384
+MD5 (patch-aa) = 8a5497036bd59c4b998a9155a2a96b67
MD5 (patch-ab) = 9c16fa8fac751338409018f296400416
-MD5 (patch-ac) = ccc3cfa69b1f10de39e3e6ff76104d6d
+MD5 (patch-ac) = d3df1de02aaa5c65c0b4e32bb0b86201
diff --git a/x11/qt1/patches/patch-aa b/x11/qt1/patches/patch-aa
index df135320340..5b169990962 100644
--- a/x11/qt1/patches/patch-aa
+++ b/x11/qt1/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
-
---- configs/netbsd-g++-static.orig Fri Feb 26 12:02:07 1999
-+++ configs/netbsd-g++-static Sun Mar 26 09:44:53 2000
-@@ -1,4 +1,5 @@
+--- configs/netbsd-g++-static.orig Fri Feb 26 17:02:07 1999
++++ configs/netbsd-g++-static Thu Jun 15 12:37:34 2000
+@@ -1,5 +1,6 @@
# Compiling
SYSCONF_CXX = g++
+SYSCONF_CXX_LIB = $(LIBTOOL) --mode=compile g++
# Compiling with support libraries
-@@ -15,6 +16,6 @@
+ SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
+@@ -14,8 +15,8 @@
+ SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
SYSCONF_LIBS_X11 = -lX11 -lXext
# Qt, Qt+OpenGL
-SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
@@ -17,7 +17,9 @@ $NetBSD: patch-aa,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
+SYSCONF_LIBS_QT = $(QTDIR)/src/libqt.la
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
-@@ -25,37 +26,23 @@
+ SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+@@ -24,38 +25,24 @@
+ SYSCONF_LIBS_YACC =
# Linking applications
-SYSCONF_LINK = g++
@@ -51,7 +53,7 @@ $NetBSD: patch-aa,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
+SYSCONF_LINK_TARGET = lib$(TARGET).la
+SYSCONF_LINK_LIB = rm -f $(SYSCONF_LINK_TARGET) ; \
-+ $(LIBTOOL) --mode=link g++ -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) \
++ $(LIBTOOL) --mode=link g++ -rpath $(QTPREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) \
+ -o $(SYSCONF_LINK_TARGET) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo)
# Compiling application source
SYSCONF_CXXFLAGS = -O2 -fno-strength-reduce
diff --git a/x11/qt1/patches/patch-ac b/x11/qt1/patches/patch-ac
index d82db292846..8f0d951918f 100644
--- a/x11/qt1/patches/patch-ac
+++ b/x11/qt1/patches/patch-ac
@@ -1,8 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
-
---- configs/solaris-g++-static.orig Fri Feb 26 12:02:12 1999
-+++ configs/solaris-g++-static Sun Mar 26 09:45:22 2000
-@@ -1,9 +1,10 @@
+--- configs/solaris-g++-static.orig Fri Feb 26 17:02:12 1999
++++ configs/solaris-g++-static Thu Jun 15 12:37:59 2000
+@@ -1,30 +1,31 @@
# Compiling
-SYSCONF_CXX = g++
+SYSCONF_CXX = ${LOCALBASE}/egcs/bin/g++
@@ -16,14 +14,16 @@ $NetBSD: patch-ac,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
+SYSCONF_CXXFLAGS_OPENGL = -I${X11BASE}/include
# Compiline YACC output
-@@ -12,5 +13,5 @@
+ SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
+
# Linking with support libraries
# X11
-SYSCONF_LFLAGS_X11 = -L/usr/openwin/lib
+SYSCONF_LFLAGS_X11 = -L${X11BASE}/lib
SYSCONF_LIBS_X11 = -lX11 -lXext
# Qt, Qt+OpenGL
-@@ -19,11 +20,11 @@
+ SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
+ SYSCONF_LIBS_QT = -lqt
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
-SYSCONF_LFLAGS_OPENGL =
@@ -38,22 +38,27 @@ $NetBSD: patch-ac,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $
+SYSCONF_LINK = ${LOCALBASE}/egcs/bin/g++
SYSCONF_LFLAGS =
SYSCONF_LIBS =
-@@ -40,5 +41,5 @@
+
+@@ -39,7 +40,7 @@
+ # - Place target in $(DESTDIR) - which has a trailing /
# - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
#
-SYSCONF_LINK_SHLIB = g++
+SYSCONF_LINK_SHLIB = ${LOCALBASE}/egcs/bin/g++
SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -h $(TARGET1) -shared \
-@@ -55,8 +56,8 @@
+ $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+@@ -54,10 +55,10 @@
+ # - 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_AR = $(LIBTOOL) --mode=link $(SYSCONF_CXX) -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o
++SYSCONF_AR = $(LIBTOOL) --mode=link $(SYSCONF_CXX) -rpath $(QTPREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o
+SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).la
SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
+ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo)
# Compiling application source
SYSCONF_CXXFLAGS = -O2 -fno-strength-reduce
+ # Compiling library source