cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rearrange qt and qt2 slightly, so that both libraries appear in

Browse Source 
/usr/local/lib.

This removes the need to add to shlib_dirs.

HOWEVER, ports that depend on these should explicitly use
-L/usr/local/lib/qt  or -L/usr/local/lib/qt2 to be sure to grab the right
library, even if the other library is installed as well.
This commit is contained in:
espie 2001-06-09 19:53:22 +00:00
parent 02cfbda4f0
commit c366ff0ea8
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/qt/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2001/04/18 14:59:28 brad Exp $
# $OpenBSD: Makefile,v 1.56 2001/06/09 19:53:22 espie Exp $
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
COMMENT= "C++ X11 GUI toolkit"
@ -87,11 +87,13 @@ do-install:
${INSTALL_DATA_DIR} ${QT_EXAMPLES}
${INSTALL_DATA_DIR} ${QT_TUTORIAL}
${INSTALL_DATA_DIR} ${QT_DOC}/html
${INSTALL_DATA_DIR} ${PREFIX}/lib/qt
@if [ -f ${WRKBUILD}/lib/libqt.a ]; then \
${INSTALL_DATA} ${WRKBUILD}/lib/libqt.a ${PREFIX}/lib; \
${INSTALL_DATA} ${WRKBUILD}/lib/libqt.a ${PREFIX}/lib/qt; \
fi
@if [ -f ${WRKBUILD}/lib/libqt.so.${VER_MAJ}.${VER_MIN} ]; then \
${INSTALL_DATA} ${WRKBUILD}/lib/libqt.so.${VER_MAJ}.${VER_MIN} ${PREFIX}/lib; \
${INSTALL_DATA} ${WRKBUILD}/lib/libqt.so.${VER_MAJ}.${VER_MIN} ${PREFIX}/lib/qt; \
ln -sf qt/libqt.so.${VER_MAJ}.${VER_MIN} ${PREFIX}/lib; \
fi
@if [ -f ${WRKBUILD}/lib/libqimgio.a ]; then \
${INSTALL_DATA} ${WRKBUILD}/lib/libqimgio.a ${PREFIX}/lib; \

5
x11/qt/pkg/PFRAG.no-shared
View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PFRAG.no-shared,v 1.2 2000/06/22 17:01:59 espie Exp $
@pkgcfl qt2-*
lib/libqt.a
@comment $OpenBSD: PFRAG.no-shared,v 1.3 2001/06/09 19:53:24 espie Exp $
lib/qt/libqt.a
lib/libqimgio.a

5
x11/qt/pkg/PFRAG.shared
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2000/06/09 19:18:14 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2001/06/09 19:53:24 espie Exp $
lib/libqt.so.1.45
lib/libqimgio.so.1.45
@exec /sbin/ldconfig -m %B
DYNLIBDIR(%B)
lib/qt/libqt.so.1.45

3
x11/qt2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2001/05/24 02:28:32 kevlo Exp $
# $OpenBSD: Makefile,v 1.26 2001/06/09 19:53:25 espie Exp $
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
COMMENT= C++ X11 GUI toolkit
COMMENT-examples= examples and tutorial for qt2
@ -109,6 +109,7 @@ do-install:
fi
@if [ -f ${WRKBUILD}/lib/libqt.so.2.30 ]; then \
${INSTALL_DATA} ${WRKBUILD}/lib/libqt.so.2.30 ${PREFIX}/lib/qt2; \
ln -sf qt2/libqt.so.2.30 ${PREFIX}/lib/libqt.so.2.30; \
fi
${INSTALL_PROGRAM} ${WRKBUILD}/bin/moc ${QT_LIBDIR}/bin
${INSTALL_MAN} ${WRKSRC}/src/moc/moc.1 ${QT_MANDIR}/man1/moc2.1

5
x11/qt2/pkg/PFRAG.shared
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.11 2001/03/21 23:56:52 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.12 2001/06/09 19:53:25 espie Exp $
lib/qt2/libqt.so.2.30
NEWDYNLIBDIR(%B)
lib/libqt.so.2.30
DYNLIBDIR(%B)