From 661c576b6dd526ca8974de6b08a574837f001891 Mon Sep 17 00:00:00 2001 From: espie Date: Wed, 18 May 2005 14:24:32 +0000 Subject: [PATCH] do not create symlinks for libraries. --- x11/qt3/Makefile | 4 ++-- .../patches/patch-qmake_generators_unix_unixmake_cpp | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 x11/qt3/patches/patch-qmake_generators_unix_unixmake_cpp diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index fcdb9bc67e3..3df6f249716 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.48 2005/04/09 21:24:12 espie Exp $ +# $OpenBSD: Makefile,v 1.49 2005/05/18 14:24:32 espie Exp $ # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $ COMMENT= "C++ X11 GUI toolkit" @@ -11,7 +11,7 @@ PKGNAME= qt3-${VERSION} PKGNAME-mysql= qt3-mysql-${VERSION} PKGNAME-postgresql= qt3-postgresql-${VERSION} PKGNAME-examples= qt3-examples-${VERSION} -FULLPKGNAME= qt3-mt-${VERSION}${PKGDEBUG}p1 +FULLPKGNAME= qt3-mt-${VERSION}${PKGDEBUG}p2 FULLPKGNAME-html= qt3-html-${VERSION} VERSION= 3.4 diff --git a/x11/qt3/patches/patch-qmake_generators_unix_unixmake_cpp b/x11/qt3/patches/patch-qmake_generators_unix_unixmake_cpp new file mode 100644 index 00000000000..f1bb0598f80 --- /dev/null +++ b/x11/qt3/patches/patch-qmake_generators_unix_unixmake_cpp @@ -0,0 +1,12 @@ +$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.1 2005/05/18 14:24:32 espie Exp $ +--- qmake/generators/unix/unixmake.cpp.orig Fri Jan 21 18:16:26 2005 ++++ qmake/generators/unix/unixmake.cpp Wed May 18 16:21:46 2005 +@@ -802,7 +802,7 @@ UnixMakefileGenerator::defaultInstall(co + uninst.append("\n\t"); + uninst.append("-$(DEL_FILE) \"" + dst_pc + "\""); + } +- if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") ) { ++ if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") && project->isEmpty("QMAKE_OPENBSD_SHLIBS") ) { + if ( !project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin") ) { + if ( project->isEmpty("QMAKE_HPUX_SHLIB") ) { + links << "$(TARGET0)" << "$(TARGET1)" << "$(TARGET2)";