[csw-devel] SF.net SVN: gar:[10912] csw/mgar/pkg/openssl/trunk

[chninkel at users.sourceforge.net]

Revision: 10912
          http://gar.svn.sourceforge.net/gar/?rev=10912&view=rev
Author:   chninkel
Date:     2010-09-02 21:46:16 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssl: fixed checkpkg compliance and switched to sun studio 12

Modified Paths:
--------------
    csw/mgar/pkg/openssl/trunk/Makefile
    csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype
    csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386
    csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc
    csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386
    csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc
    csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2010-09-02 21:46:16 UTC (rev 10912)
@@ -54,7 +54,7 @@
 
 CHECKPKG_OVERRIDES_CSWosslrt += surplus-dependency|CSWcacertificates
 # we will not recompile old 0.9.7 version for now
-ifeq ($(GARCH),sparc) 
+ifeq ($(shell /usr/bin/uname -p),sparc) 
 CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7
 CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.7
 else
@@ -63,7 +63,7 @@
 endif
 
 # we do ship .a files in the devel package
-ifeq ($(GARCH),sparc) 
+ifeq ($(shell /usr/bin/uname -p),sparc) 
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a
@@ -106,9 +106,6 @@
 
 ##### Build and installation information #####
 
-GARCOMPILER = SOS11
-
-
 # The list of instructions set for which we will 
 # provide optimized libraries and binaries
 EXTRA_BUILD_ISAS_i386 = pentium_pro amd64
@@ -202,4 +199,4 @@
 	cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf -
 	@$(MAKECOOKIE)
 
-post-merge: install-certs install-oldlibs install-changelog install-doc
+pre-package: install-certs install-oldlibs install-changelog install-doc

Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype	2010-09-02 21:46:16 UTC (rev 10912)
@@ -11,3 +11,4 @@
 f none /opt/csw/share/doc/openssl/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWossl

Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386	2010-09-02 21:46:16 UTC (rev 10912)
@@ -1051,3 +1051,4 @@
 f none /opt/csw/share/doc/openssl_devel/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl_devel/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_devel/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWossldevel

Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc	2010-09-02 21:46:16 UTC (rev 10912)
@@ -1050,3 +1050,7 @@
 f none /opt/csw/share/doc/openssl_devel/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl_devel/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_devel/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWossldevel
+i copyright=CSWossldevel.copyright
+i depend=CSWossldevel.depend
+i pkginfo=CSWossldevel.pkginfo

Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386	2010-09-02 21:46:16 UTC (rev 10912)
@@ -41,3 +41,4 @@
 f none /opt/csw/share/doc/openssl_rt/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl_rt/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_rt/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWosslrt

Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc	2010-09-02 21:46:16 UTC (rev 10912)
@@ -44,3 +44,10 @@
 f none /opt/csw/share/doc/openssl_rt/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl_rt/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_rt/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWosslrt
+i checkinstall=CSWosslrt.checkinstall
+i copyright=CSWosslrt.copyright
+i depend=CSWosslrt.depend
+i pkginfo=CSWosslrt.pkginfo
+i postinstall=CSWosslrt.postinstall
+i preinstall=CSWosslrt.preinstall

Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype	2010-09-02 21:40:39 UTC (rev 10911)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype	2010-09-02 21:46:16 UTC (rev 10912)
@@ -74,3 +74,4 @@
 f none /opt/csw/share/doc/openssl_utils/NEWS 644 root bin
 f none /opt/csw/share/doc/openssl_utils/README.ENGINE 644 root bin
 f none /opt/csw/share/doc/openssl_utils/README.CSW 644 root bin
+i checkpkg_override=checkpkg_override.CSWosslutils


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.