Date: Wed, 21 Mar 2001 09:58:15 -0500 From: Will Andrews <will@physics.purdue.edu> To: FreeBSD Ports <ports@FreeBSD.org> Subject: bsd.kdeqt.mk Message-ID: <20010321095815.X469@ohm.physics.purdue.edu>
next in thread | raw e-mail | index | archive | help
--vy3x0i7GCC7mAH4A
Content-Type: multipart/mixed; boundary="DOQx4ubtbYINM/to"
Content-Disposition: inline
--DOQx4ubtbYINM/to
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hello guys,
Given the rapid rise in complexity recently with KDE/QT stuff, I decided
last night to take another shot at bsd.kdeqt.mk. Here are the diffs.
Could Satoshi please put these in the cluster at some point, so that at
least the mechanism in which the USE_QT* stuff is checked? Then I can
handle the rest of the outsourcing.
Suggestions on how to improve it would be most welcome. They are based
on what I've got in my tree currently, and depend on the PTHREAD_* patch
to bsd.port.mk that Satoshi has in the build cluster currently.
--=20
wca
--DOQx4ubtbYINM/to
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="kdeqt.diff"
Content-Transfer-Encoding: quoted-printable
Index: bsd.port.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/FreeBSD/ports/Mk/bsd.port.mk,v
retrieving revision 1.362
diff -u -u -r1.362 bsd.port.mk
--- bsd.port.mk 2001/02/17 00:46:26 1.362
+++ bsd.port.mk 2001/03/21 14:54:27
@@ -171,10 +171,6 @@
# target.
# USE_X_PREFIX - Says that the port installs in ${X11BASE}. Implies USE_X=
LIB.
# USE_XLIB - Says that the port uses X libraries.
-# USE_QT - Says that the port uses version 1 of the qt toolkit.
-# Implies USE_NEWGCC.
-# USE_QT2 - Says that the port uses version 2 of the qt toolkit.
-# Implies USE_NEWGCC.
# USE_MOTIF - Says that the port uses the Motif toolkit. Implies USE_XPM.
#
# Dependency checking. Use these if your port requires another port
@@ -706,6 +702,10 @@
.include "${PORTSDIR}/Mk/bsd.ruby.mk"
.endif
=20
+.if defined(USE_QT) || defined(USE_QT2) || defined(USE_KDELIBS) || defined=
(USE_KDELIBS2) || defined(USE_KDEBASE) || defined(USE_KDEBASE2)
+.include "${PORTSDIR}/Mk/bsd.kdeqt.mk"
+.endif
+
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
=20
# defaults to 3.3.6; will be changed to 4.0 when it is ready
@@ -763,16 +763,6 @@
MANCOMPRESSED?=3D yes
.else
MANCOMPRESSED?=3D no
-.endif
-
-.if defined(USE_QT)
-LIB_DEPENDS+=3D qt.3:${PORTSDIR}/x11-toolkits/qt145
-USE_NEWGCC=3D yes
-.endif
-
-.if defined(USE_QT2)
-LIB_DEPENDS+=3D qt2.4:${PORTSDIR}/x11-toolkits/qt22
-USE_NEWGCC=3D yes
.endif
=20
.if defined(USE_BZIP2)
--- /dev/null Wed Mar 21 09:45:18 2001
+++ bsd.kdeqt.mk Wed Mar 21 01:50:02 2001
@@ -0,0 +1,84 @@
+#-*- mode: Fundamental; tab-width: 4; -*-
+# ex:ts=3D4
+#
+# $FreeBSD$
+#
+# Please view me with 4 column tabs!
+
+# Please make sure all changes to this file are past through the maintaine=
r.=20
+# Do not commit them yourself (unless of course you're the Port's Wraith ;=
).
+KDEQT_MAINTAINER=3D will@FreeBSD.org
+
+.if defined(_POSTMKINCLUDED)
+
+# This section contains the USE_ definitions. These also pass any HAVE_
+# options through to the build process so that ports can use them for
+# conditional building of components. Also, if optional support has been
+# requested, add a packagename suffix, to indicate the change in the port's
+# behaviour.
+
+# USE_QT - Says that the port uses version 1 of the Qt toolkit. Implies =
USE_NEWGCC.
+# USE_QT2 - Says that the port uses version 2 of the Qt toolkit. Implies=
USE_NEWGCC.
+# USE_KDELIBS - Says that the port uses version 1 of KDELIBS. Implies USE=
_QT.
+# USE_KDELIBS2 - Says that the port uses version 2 of KDELIBS. Implies US=
E_QT2.
+# USE_KDEBASE - Says that the port uses version 1 of KDEBASE. Implies USE=
_KDELIBS.
+# USE_KDEBASE2 - Says that the port uses version 2 of KDEBASE. Implies US=
E_KDELIBS2.
+
+# Qt 1.x common stuff
+.if defined(USE_QT)
+LIB_DEPENDS+=3D qt.3:${PORTSDIR}/x11-toolkits/qt145
+USE_NEWGCC=3D yes
+MOC?=3D ${X11BASE}/bin/moc
+.if defined(PREFIX)
+QTDIR=3D ${PREFIX}
+.else
+QTDIR=3D ${X11BASE}
+.endif
+CONFIGURE_ENV+=3D MOC=3D"${MOC}" QTDIR=3D"${QTDIR}"
+.endif
+
+# Qt 2.x common stuff
+.if defined(USE_QT2)
+LIB_DEPENDS+=3D qt2.4:${PORTSDIR}/x11-toolkits/qt23
+USE_NEWGCC=3D yes
+QTNAME=3D qt2
+MOC?=3D ${X11BASE}/bin/moc2
+CONFIGURE_ARGS+=3D--with-qt-includes=3D${X11BASE}/include/qt2 \
+ --with-qt-libraries=3D${X11BASE}/lib \
+ --with-extra-libs=3D${LOCALBASE}/lib
+QTCPPFLAGS=3D -I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H
+QTCFGLIBS=3D -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++
+.if exists(${X11BASE}/lib/libqt2-mt.so) && exists(${X11BASE}/lib/libXThrSt=
ub.so)
+QTNAME=3D qt2-mt
+CONFIGURE_ARGS+=3D--enable-mt
+QTCPPFLAGS+=3D ${PTHREAD_CFLAGS}
+QTCFGLIBS+=3D ${PTHREAD_LIBS}
+.endif
+CONFIGURE_ENV+=3D MOC=3D"${MOC}" LIBQT=3D"-l${QTNAME}" \
+ CPPFLAGS=3D"${QTCPPFLAGS}" LIBS=3D"${QTCFGLIBS}" LDFLAGS=3D"${QTCFGLIB=
S}"
+.endif
+
+# kdelibs 1.x common stuff
+.if defined(USE_KDELIBS)
+LIB_DEPENDS+=3D kdelibs.3:${PORTSDIR}/x11/kdelibs11
+USE_QT=3D yes
+.endif
+
+# kdelibs 2.x common stuff
+.if defined(USE_KDELIBS2)
+LIB_DEPENDS+=3D kdelibs.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2=3D yes
+.endif
+
+# kdebase 1.x common stuff
+.if defined(USE_KDEBASE)
+RUN_DEPENDS+=3D kcontrol:${PORTSDIR}/x11/kdebase11
+.endif
+
+# kdebase 2.x common stuff
+.if defined(USE_KDEBASE2)
+LIB_DEPENDS+=3D kparts.4:${PORTSDIR}/x11/kdebase2
+.endif
+
+.endif
+# End of use part.
--DOQx4ubtbYINM/to--
--vy3x0i7GCC7mAH4A
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.4 (FreeBSD)
Comment: For info see http://www.gnupg.org
iD8DBQE6uMGHF47idPgWcsURAlO/AJ92yLNwp+XNMDpYOuEQa9IAJU60CgCeIUn4
KZ9+hkjnlPxocgT4jAaP5JM=
=+vNB
-----END PGP SIGNATURE-----
--vy3x0i7GCC7mAH4A--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010321095815.X469>