[114712] trunk/dports/devel/cryptlib

ryandesign at macports.org ryandesign at macports.org
Fri Dec 13 21:18:19 PST 2013


Revision: 114712
          https://trac.macports.org/changeset/114712
Author:   ryandesign at macports.org
Date:     2013-12-13 21:18:19 -0800 (Fri, 13 Dec 2013)
Log Message:
-----------
cryptlib: remove alleged sunos support to simplify the port; the patch didn't apply and hadn't been updated in a decade

Modified Paths:
--------------
    trunk/dports/devel/cryptlib/Portfile

Removed Paths:
-------------
    trunk/dports/devel/cryptlib/files/patch-makefile.sunos

Modified: trunk/dports/devel/cryptlib/Portfile
===================================================================
--- trunk/dports/devel/cryptlib/Portfile	2013-12-14 04:41:56 UTC (rev 114711)
+++ trunk/dports/devel/cryptlib/Portfile	2013-12-14 05:18:19 UTC (rev 114712)
@@ -8,7 +8,7 @@
 version             3.4.1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel security crypto
-platforms           darwin sunos
+platforms           darwin
 maintainers         nomaintainer
 license             {Sleepycat Restrictive}
 
@@ -38,7 +38,8 @@
 }
 extract.mkdir       yes
 
-patchfiles          patch-makefile.diff \
+patchfiles          patch-crypt_osconfig.h \
+                    patch-makefile.diff \
                     patch-tools-ccopts.sh.diff
 
 # Build fails when compiler is gcc or llvm-gcc; warnings are printed when compiler is clang.
@@ -53,27 +54,13 @@
                     CC="${configure.cc}"
 
 destroot {
-    xinstall -m 644 ${worksrcpath}/libcl.a ${worksrcpath}/${cryptlibDylib} ${destroot}${prefix}/lib
-    ln -s ${cryptlibDylib} ${destroot}${prefix}/lib/${cryptlibDylibLink}
+    xinstall -m 644 ${worksrcpath}/libcl.a ${worksrcpath}/libcl.${branch}.dylib ${destroot}${prefix}/lib
+    ln -s libcl.${branch}.dylib ${destroot}${prefix}/lib/libcl.dylib
     xinstall -m 644 ${worksrcpath}/cryptlib.h ${destroot}${prefix}/include
     xinstall -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
 }
 
-platform darwin {
-    patchfiles-append       patch-crypt_osconfig.h
-    global cryptlibDylib cryptlibDylibLink
-    set cryptlibDylib       libcl.${branch}.dylib
-    set cryptlibDylibLink   libcl.dylib
-}
-
-platform sunos {
-    patchfiles-append       patch-makefile.sunos
-    global cryptlibDylib cryptlibDylibLink
-    set cryptlibDylib       libcl.so.${branch}
-    set cryptlibDylibLink   libcl.so
-}
-
 livecheck.type      regex
 livecheck.url       ${homepage}download.html
 livecheck.regex     ${name} (\[0-9.\]+)

Deleted: trunk/dports/devel/cryptlib/files/patch-makefile.sunos
===================================================================
--- trunk/dports/devel/cryptlib/files/patch-makefile.sunos	2013-12-14 04:41:56 UTC (rev 114711)
+++ trunk/dports/devel/cryptlib/files/patch-makefile.sunos	2013-12-14 05:18:19 UTC (rev 114712)
@@ -1,93 +0,0 @@
---- makefile.orig	2003-12-16 03:01:22.000000000 -0700
-+++ makefile	2004-01-25 18:43:28.191767000 -0700
-@@ -345,13 +345,12 @@
- 					`uname` ; \
- 			fi ;; \
- 		'SunOS') \
--			if [ `which $(CC) | grep -c ucb` = '1' ] && \
--			   [ `which ucbcc | grep -c ucb` = '0' ] ; then \
--				make CC=gcc CFLAGS="$(CFLAGS) `./endian` \
-+			if [ -f /usr/ccs/bin/ucbcc ] ; then \
-+				make CFLAGS="$(CFLAGS) `./endian` \
- 					-DOSVERSION=`uname -r | sed 's/^[A-Z].//' | cut -f 1 -d '.'`" \
- 					`uname` ; \
- 			else \
--				make CFLAGS="$(CFLAGS) `./endian` \
-+				make CC=gcc CFLAGS="$(CFLAGS) `./endian` \
- 					-DOSVERSION=`uname -r | sed 's/^[A-Z].//' | cut -f 1 -d '.'`" \
- 					`uname` ; \
- 			fi ;; \
-@@ -383,15 +382,14 @@
- 				-DOSVERSION=`uname -r | sed 's/^[A-Z].//' | cut -f 1 -d '.'`" \
- 				`uname` ;; \
- 		'SunOS') \
--			if [ `which $(CC) | grep -c ucb` = '1' ] && \
--			   [ `which ucbcc | grep -c ucb` = '0' ] ; then \
-+			if [ -f /usr/ccs/bin/ucbcc ] ; then \
- 				make TARGET=$(SLIBNAME) OBJPATH=$(SHARED_OBJ_PATH) \
--					CC=gcc CFLAGS="$(SCFLAGS) `./endian` \
-+					CFLAGS="$(SCFLAGS) `./endian` \
- 					-DOSVERSION=`uname -r | sed 's/^[A-Z].//' | cut -f 1 -d '.'`" \
- 					`uname` ; \
- 			else \
- 				make TARGET=$(SLIBNAME) OBJPATH=$(SHARED_OBJ_PATH) \
--					CFLAGS="$(SCFLAGS) `./endian` \
-+					CC=gcc CFLAGS="$(SCFLAGS) `./endian` \
- 					-DOSVERSION=`uname -r | sed 's/^[A-Z].//' | cut -f 1 -d '.'`" \
- 					`uname` ; \
- 			fi ;; \
-@@ -1100,7 +1098,7 @@
- 						else \
- 							if [ `uname -a | grep -c sun4m` = '1' ] ; then \
- 								gcc -mcpu=supersparc -c bn/sparcv8.S -o $(OBJPATH)bn_asm.o ; \
--							else
-+							else \
- 								gcc -mcpu=ultrasparc -c bn/sparcv8plus.S -o $(OBJPATH)bn_asm.o ; \
- 							fi ; \
- 						fi
-@@ -1338,21 +1336,19 @@
- 							make link LIB=$(LIB) OUT=$(OUT) \
- 								OS_LDFLAGS="$(LDFLAGS_SUNOS)" ;; \
- 						5) \
--							if [ `which $(LD) | grep -c ucb/cc` = '1' ] && \
--							   [ `which ucbcc | grep -c ucbcc` = '0' ] ; then \
--								make link LD=gcc LIB=$(LIB) OUT=$(OUT) \
-+							if [ -f /usr/ccs/bin/ucbcc ] ; then \
-+								make link LIB=$(LIB) OUT=$(OUT) \
- 									OS_LDFLAGS="$(LDFLAGS_SOLARIS5)" ; \
- 							else \
--								make link LIB=$(LIB) OUT=$(OUT) \
-+								make link LD=gcc LIB=$(LIB) OUT=$(OUT) \
- 									OS_LDFLAGS="$(LDFLAGS_SOLARIS5)" ; \
- 							fi ;; \
- 						6|7|8|9) \
--							if [ `which $(LD) | grep -c ucb/cc` = '1' ] && \
--							   [ `which ucbcc | grep -c ucbcc` = '0' ] ; then \
--								make link LD=gcc LIB=$(LIB) OUT=$(OUT) \
-+							if [ -f /usr/ccs/bin/ucbcc ] ; then \
-+								make link LIB=$(LIB) OUT=$(OUT) \
- 									OS_LDFLAGS="$(LDFLAGS_SOLARIS7)" ; \
- 							else \
--								make link LIB=$(LIB) OUT=$(OUT) \
-+								make link LD=gcc LIB=$(LIB) OUT=$(OUT) \
- 									OS_LDFLAGS="$(LDFLAGS_SOLARIS7)" ; \
- 							fi ;; \
- 					esac ;; \
-@@ -1690,13 +1686,12 @@
- 	@- if [ `uname -r | tr -d '[A-Z].' | cut -c 1` = '4' ] ; then \
- 		make $(DEFINES) CC=gcc CFLAGS="$(CFLAGS) -fomit-frame-pointer -O3" ; \
- 	else \
--		if [ `which $(CC) | grep -c ucb/cc` = '1' ] && \
--		   [ `which ucbcc | grep -c ucbcc` = '0' ] ; then \
--			make $(DEFINES) CC=$(CC) CFLAGS="$(CFLAGS) -fomit-frame-pointer \
--				-O3 -D_REENTRANT" ; \
--		else \
-+		if [ -f /usr/ccs/bin/ucbcc ] ; then \
- 			make $(DEFINES) CFLAGS="$(CFLAGS) -erroff=E_ARG_INCOMPATIBLE_WITH_ARG \
- 				-xO3 -D_REENTRANT" ; \
-+		else \
-+			make $(DEFINES) CC=$(CC) CFLAGS="$(CFLAGS) -fomit-frame-pointer \
-+				-O3 -D_REENTRANT" ; \
- 		fi ; \
- 	fi
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131213/c366c075/attachment-0001.html>


More information about the macports-changes mailing list