Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Jan 2017 13:50:09 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r431265 - head/lang/libobjc2
Message-ID:  <201701121350.v0CDo99A083309@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Jan 12 13:50:09 2017
New Revision: 431265
URL: https://svnweb.freebsd.org/changeset/ports/431265

Log:
  - Remove long dead FreeBSD 9.2 related conditions
  
  Approved by:	portmgr blanket

Modified:
  head/lang/libobjc2/Makefile
  head/lang/libobjc2/pkg-plist

Modified: head/lang/libobjc2/Makefile
==============================================================================
--- head/lang/libobjc2/Makefile	Thu Jan 12 13:46:46 2017	(r431264)
+++ head/lang/libobjc2/Makefile	Thu Jan 12 13:50:09 2017	(r431265)
@@ -18,33 +18,18 @@ BROKEN_sparc64=		Does not compile on spa
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnustep
 
-.include <bsd.port.options.mk>
-
 SHLIB_MAJOR=	4
 SHLIB_MINOR=	6
 
 PLIST_SUB+=	SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
 
-.if ${OSVERSION} < 902000
-CMAKE_ARGS+=	-DFORCE_LIBOBJCXX=ON
-PLIST_SUB+=	WITH_SEPARATECXX=""
-.else
-PLIST_SUB+=	WITH_SEPARATECXX="@comment "
-.endif
-
 CMAKE_ARGS+=	-DLIB_INSTALL_PATH=lib
 CMAKE_ARGS+=	-DTESTS=OFF
 # This shouldn't be needed, but our llvm port installs llvm-config with a silly
 # name...
 CMAKE_ARGS+=	-DLLVM_OPTS=OFF
 
-.if ${OSVERSION} < 902000
-post-install:
-	${LN} -sf libobjc.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libobjc.so.${SHLIB_MAJOR}
-	${LN} -sf libobjcxx.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libobjcxx.so.${SHLIB_MAJOR}
-.else
 post-install:
 	${LN} -sf libobjc.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libobjc.so.${SHLIB_MAJOR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/lang/libobjc2/pkg-plist
==============================================================================
--- head/lang/libobjc2/pkg-plist	Thu Jan 12 13:46:46 2017	(r431264)
+++ head/lang/libobjc2/pkg-plist	Thu Jan 12 13:50:09 2017	(r431265)
@@ -18,6 +18,3 @@ include/objc/slot.h
 lib/libobjc.so
 lib/libobjc.so.%%SHLIB_MAJOR%%
 lib/libobjc.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
-%%WITH_SEPARATECXX%%lib/libobjcxx.so
-%%WITH_SEPARATECXX%%lib/libobjcxx.so.%%SHLIB_MAJOR%%
-%%WITH_SEPARATECXX%%lib/libobjcxx.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701121350.v0CDo99A083309>