Hi,

This patch avoids creating .so symlinks for shared libraries, as 
they break OpenBSD porting standards.

This is for cmake 2.4.8 currently in tree, because 2.8.1 has a 
largely different code-base and I'm still working on a port for 
it.

In the meantime I think this could be useful...

cheers,
david


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.17
diff -N -u -p Makefile
--- Makefile    10 Sep 2009 13:54:47 -0000      1.17
+++ Makefile    4 Apr 2010 17:28:17 -0000
@@ -4,7 +4,7 @@ HOMEPAGE=               http://www.cmake.org/
 CATEGORIES=            devel
 COMMENT=               portable build system
 DISTNAME=              cmake-2.4.8
-PKGNAME=               ${DISTNAME}p2
+PKGNAME=               ${DISTNAME}p3
 MASTER_SITES=          ${HOMEPAGE}files/v2.4/
 MAINTAINER=            Marc Espie <es...@openbsd.org>
 
Index: patches/patch-Source_cmFileCommand_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmFileCommand_cxx,v
retrieving revision 1.2
diff -N -u -p patches/patch-Source_cmFileCommand_cxx
--- patches/patch-Source_cmFileCommand_cxx      25 Aug 2007 08:35:20 -0000      
1.2
+++ patches/patch-Source_cmFileCommand_cxx      4 Apr 2010 17:28:17 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Source_cmFileCommand_cxx,v 1.2 2007/08/25 08:35:20 espie Exp $
---- Source/cmFileCommand.cxx.orig      Mon Jul 16 23:12:30 2007
-+++ Source/cmFileCommand.cxx   Mon Aug 13 02:50:05 2007
-@@ -1279,10 +1279,44 @@ bool cmFileCommand::HandleInstallCommand(
+--- Source/cmFileCommand.cxx.orig      Mon Jan 21 19:59:52 2008
++++ Source/cmFileCommand.cxx   Sun Apr  4 18:54:42 2010
+@@ -1279,14 +1279,49 @@ bool cmFileCommand::HandleInstallCommand(
            std::string libname = toFile;
            std::string soname = toFile;
            std::string soname_nopath = fromName;
@@ -46,3 +46,16 @@ $OpenBSD: patch-Source_cmFileCommand_cxx,v 1.2 2007/08
  
            cmSystemTools::RemoveFile(soname.c_str());
            cmSystemTools::RemoveFile(libname.c_str());
+ 
++#if !defined(__OpenBSD__)
+           if (!cmSystemTools::CreateSymlink(soname_nopath.c_str(), 
+                                             libname.c_str()) )
+             {
+@@ -1296,6 +1331,7 @@ bool cmFileCommand::HandleInstallCommand(
+             return false;
+             }
+           installer.ManifestAppend(libname);
++#endif
+           if ( toFile != soname )
+             {
+             if ( !cmSystemTools::CreateSymlink(fromName.c_str(), 
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/qgis/Makefile,v
retrieving revision 1.8
diff -N -u -p Makefile
--- Makefile    11 Jan 2010 20:13:31 -0000      1.8
+++ Makefile    4 Apr 2010 17:29:28 -0000
@@ -3,7 +3,7 @@
 COMMENT =      desktop geographical information system
 
 DISTNAME =     qgis_1.4.0
-PKGNAME =      ${DISTNAME:L:S/_/-/}
+PKGNAME =      ${DISTNAME:L:S/_/-/}p0
 
 CATEGORIES =   geo x11
 
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/geo/qgis/pkg/PFRAG.shared,v
retrieving revision 1.4
diff -N -u -p pkg/PFRAG.shared
--- pkg/PFRAG.shared    11 Jan 2010 20:13:31 -0000      1.4
+++ pkg/PFRAG.shared    4 Apr 2010 17:29:28 -0000
@@ -1,11 +1,7 @@
 @comment $OpenBSD: PFRAG.shared,v 1.4 2010/01/11 20:13:31 landry Exp $
-lib/libqgis_analysis.so
 @lib lib/libqgis_analysis.so.${LIBqgis_analysis_VERSION}
-lib/libqgis_core.so
 @lib lib/libqgis_core.so.${LIBqgis_core_VERSION}
-lib/libqgis_gui.so
 @lib lib/libqgis_gui.so.${LIBqgis_gui_VERSION}
-lib/libqgispython.so
 @lib lib/libqgispython.so.${LIBqgispython_VERSION}
 lib/qgis/
 lib/qgis/libcoordinatecaptureplugin.so
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/plplot/Makefile,v
retrieving revision 1.25
diff -N -u -p Makefile
--- Makefile    12 Oct 2009 23:11:08 -0000      1.25
+++ Makefile    4 Apr 2010 17:30:39 -0000
@@ -16,9 +16,9 @@ SHARED_LIBS=  csirocsa        2.0     \
                plplottcltkd    12.0    \
                tclmatrixd      12.0
 
-PKGNAME-main=  ${DISTNAME}p1
-PKGNAME-c++ =  plplot-c++-${VERSION}p1
-PKGNAME-f77=   plplot-f77-${VERSION}p1
+PKGNAME-main=  ${DISTNAME}p2
+PKGNAME-c++ =  plplot-c++-${VERSION}p2
+PKGNAME-f77=   plplot-f77-${VERSION}p2
 
 CATEGORIES=    math graphics
 
Index: pkg/PLIST-c++
===================================================================
RCS file: /cvs/ports/math/plplot/pkg/PLIST-c++,v
retrieving revision 1.4
diff -N -u -p pkg/PLIST-c++
--- pkg/PLIST-c++       28 Jun 2009 16:17:27 -0000      1.4
+++ pkg/PLIST-c++       4 Apr 2010 17:30:39 -0000
@@ -1,5 +1,4 @@
 @comment $OpenBSD: PLIST-c++,v 1.4 2009/06/28 16:17:27 sthen Exp $
-lib/libplplotcxxd.so
 @lib lib/libplplotcxxd.so.${LIBplplotcxxd_VERSION}
 lib/pkgconfig/plplotd-c++.pc
 share/examples/plplot/c++/
Index: pkg/PLIST-f77
===================================================================
RCS file: /cvs/ports/math/plplot/pkg/PLIST-f77,v
retrieving revision 1.4
diff -N -u -p pkg/PLIST-f77
--- pkg/PLIST-f77       28 Jun 2009 16:17:27 -0000      1.4
+++ pkg/PLIST-f77       4 Apr 2010 17:30:39 -0000
@@ -1,5 +1,4 @@
 @comment $OpenBSD: PLIST-f77,v 1.4 2009/06/28 16:17:27 sthen Exp $
-lib/libplplotf77cd.so
 @lib lib/libplplotf77cd.so.${LIBplplotf77cd_VERSION}
 lib/libplplotf77d.so
 lib/pkgconfig/plplotd-f77.pc
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/math/plplot/pkg/PLIST-main,v
retrieving revision 1.3
diff -N -u -p pkg/PLIST-main
--- pkg/PLIST-main      28 Jun 2009 16:17:27 -0000      1.3
+++ pkg/PLIST-main      4 Apr 2010 17:30:39 -0000
@@ -19,9 +19,7 @@ include/plplot/plplotcanvas.h
 include/plplot/plstream.h
 include/plplot/plstrm.h
 include/plplot/plxwd.h
-lib/libcsirocsa.so
 @lib lib/libcsirocsa.so.${LIBcsirocsa_VERSION}
-lib/libplplotd.so
 @lib lib/libplplotd.so.${LIBplplotd_VERSION}
 lib/pkgconfig/plplotd.pc
 @man man/man1/plm2gif.1
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/libmusicbrainz/Makefile,v
retrieving revision 1.3
diff -N -u -p Makefile
--- Makefile    25 May 2009 13:59:09 -0000      1.3
+++ Makefile    4 Apr 2010 17:37:05 -0000
@@ -3,6 +3,7 @@
 COMMENT=               library for audio metadata lookup
 
 DISTNAME=              libmusicbrainz-3.0.2
+PKGNAME=               ${DISTNAME}p0
 
 SHARED_LIBS=           musicbrainz3    0.0     # .6.1
 CATEGORIES=            audio
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/audio/libmusicbrainz/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -N -u -p pkg/PFRAG.shared
--- pkg/PFRAG.shared    25 Mar 2008 09:19:23 -0000      1.1.1.1
+++ pkg/PFRAG.shared    4 Apr 2010 17:37:05 -0000
@@ -1,3 +1,2 @@
 @comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/03/25 09:19:23 jasper Exp $
-lib/libmusicbrainz3.so
 @lib lib/libmusicbrainz3.so.${LIBmusicbrainz3_VERSION}
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libopensync/Makefile,v
retrieving revision 1.6
diff -N -u -p Makefile
--- Makefile    4 Jun 2009 21:12:07 -0000       1.6
+++ Makefile    4 Apr 2010 17:47:48 -0000
@@ -6,6 +6,7 @@ COMMENT=        data synchronization framework
 
 V=             0.36
 DISTNAME=      libopensync-${V}
+PKGNAME=       ${DISTNAME}p0
 SHARED_LIBS += opensync 1.1
 CATEGORIES=    devel comms
 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/libopensync/pkg/PLIST,v
retrieving revision 1.3
diff -N -u -p pkg/PLIST
--- pkg/PLIST   20 Aug 2008 08:34:45 -0000      1.3
+++ pkg/PLIST   4 Apr 2010 17:47:48 -0000
@@ -76,7 +76,6 @@ include/opensync-1.0/opensync/plugin/opensync_plugin_i
 include/opensync-1.0/opensync/plugin/opensync_sink.h
 include/opensync-1.0/opensync/version/
 include/opensync-1.0/opensync/version/opensync_version.h
-...@comment lib/libopensync.so
 @lib lib/libopensync.so.${LIBopensync_VERSION}
 lib/opensync-1.0/
 lib/opensync-1.0/formats/
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/soprano/Makefile,v
retrieving revision 1.2
diff -N -u -p Makefile
--- Makefile    28 Oct 2008 16:44:58 -0000      1.2
+++ Makefile    5 Apr 2010 10:23:46 -0000
@@ -11,6 +11,7 @@ SHARED_LIBS += sopranoserver       0.0 # .1.0
 
 HOMEPAGE =     http://soprano.sourceforge.net/
 DISTNAME =     soprano-2.1.1
+PKGNAME=       ${DISTNAME}p0
 EXTRACT_SUFX = .tar.bz2
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=soprano/}
 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/soprano/pkg/PLIST,v
retrieving revision 1.2
diff -N -u -p pkg/PLIST
--- pkg/PLIST   28 Oct 2008 16:44:58 -0000      1.2
+++ pkg/PLIST   5 Apr 2010 10:23:46 -0000
@@ -141,18 +141,15 @@ include/soprano/version.h
 include/soprano/vocabulary.h
 include/soprano/xesam.h
 include/soprano/xsd.h
-lib/libsoprano.so
 @lib lib/libsoprano.so.${LIBsoprano_VERSION}
-lib/libsopranoclient.so
 @lib lib/libsopranoclient.so.${LIBsopranoclient_VERSION}
-lib/libsopranoindex.so
 @lib lib/libsopranoindex.so.${LIBsopranoindex_VERSION}
-lib/libsopranoserver.so
 @lib lib/libsopranoserver.so.${LIBsopranoserver_VERSION}
 lib/pkgconfig/soprano.pc
 lib/soprano/
 lib/soprano/libsoprano_nquadparser.so
 lib/soprano/libsoprano_nquadserializer.so
+share/dbus-1/
 share/dbus-1/interfaces/
 share/dbus-1/interfaces/org.soprano.Model.xml
 share/dbus-1/interfaces/org.soprano.NodeIterator.xml
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/strigi/pkg/PLIST,v
retrieving revision 1.4
diff -N -u -p pkg/PLIST
--- pkg/PLIST   28 Oct 2008 17:11:43 -0000      1.4
+++ pkg/PLIST   5 Apr 2010 10:36:47 -0000
@@ -55,15 +55,10 @@ include/strigi/substreamprovider.h
 include/strigi/substreamproviderprovider.h
 include/strigi/textutils.h
 include/strigi/variant.h
-lib/libsearchclient.so
 @lib lib/libsearchclient.so.${LIBsearchclient_VERSION}
-lib/libstreamanalyzer.so
 @lib lib/libstreamanalyzer.so.${LIBstreamanalyzer_VERSION}
-lib/libstreams.so
 @lib lib/libstreams.so.${LIBstreams_VERSION}
-lib/libstrigihtmlgui.so
 @lib lib/libstrigihtmlgui.so.${LIBstrigihtmlgui_VERSION}
-lib/libstrigiqtdbusclient.so
 @lib lib/libstrigiqtdbusclient.so.${LIBstrigiqtdbusclient_VERSION}
 lib/pkgconfig/libstreamanalyzer.pc
 lib/pkgconfig/libstreams.pc
@@ -85,6 +80,8 @@ lib/strigi/strigita_rgb.so
 lib/strigi/strigita_sid.so
 lib/strigi/strigita_wav.so
 lib/strigi/strigita_xbm.so
+share/dbus-1/
+share/dbus-1/services/
 share/dbus-1/services/org.freedesktop.xesam.searcher.service
 share/dbus-1/services/vandenoever.strigi.service
 share/strigi/
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/qca2/Makefile,v
retrieving revision 1.2
diff -N -u -p Makefile
--- Makefile    10 Aug 2009 06:34:29 -0000      1.2
+++ Makefile    5 Apr 2010 11:01:32 -0000
@@ -4,7 +4,7 @@ COMMENT =       Qt Cryptographic Architecture
 SHARED_ONLY =  Yes
 
 DISTNAME =     qca-2.0.0
-PKGNAME =      qca2-2.0.0p0
+PKGNAME =      qca2-2.0.0p1
 CATEGORIES =   security
 SHARED_LIBS += qca     3.0
 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/qca2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -N -u -p pkg/PLIST
--- pkg/PLIST   9 Feb 2008 10:45:36 -0000       1.1.1.1
+++ pkg/PLIST   5 Apr 2010 11:01:32 -0000
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2008/02/09 10:45:36 espie Exp $
-bin/qcatool2
+...@bin bin/qcatool2
 certs/
 certs/rootcerts.pem
 include/QtCrypto/
@@ -18,7 +18,6 @@ include/QtCrypto/qca_textfilter.h
 include/QtCrypto/qca_tools.h
 include/QtCrypto/qcaprovider.h
 include/QtCrypto/qpipe.h
-lib/libqca.so
 @lib lib/libqca.so.${LIBqca_VERSION}
 lib/pkgconfig/qca.pc
 mkspecs/
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/libnipper/Makefile,v
retrieving revision 1.8
diff -N -u -p Makefile
--- Makefile    30 Aug 2009 16:44:45 -0000      1.8
+++ Makefile    5 Apr 2010 13:11:25 -0000
@@ -3,6 +3,7 @@
 COMMENT =              library for nipper
 
 DISTNAME =             libnipper-0.12.6
+PKGNAME =              ${DISTNAME}p0
 CATEGORIES =           security net
 
 SHARED_LIBS =          nipper 0.0
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/security/libnipper/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -N -u -p pkg/PFRAG.shared
--- pkg/PFRAG.shared    20 Sep 2008 20:26:05 -0000      1.1.1.1
+++ pkg/PFRAG.shared    5 Apr 2010 13:11:25 -0000
@@ -1,3 +1,2 @@
 @comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/09/20 20:26:05 steven Exp $
-lib/libnipper.so
 @lib lib/libnipper.so.${LIBnipper_VERSION}

Reply via email to