Index: head/lang/libobjc2/Makefile
===================================================================
--- head/lang/libobjc2/Makefile	(revision 431264)
+++ head/lang/libobjc2/Makefile	(revision 431265)
@@ -1,50 +1,35 @@
 # Created by: Pete French <pete@twisted.org.uk>
 # $FreeBSD$
 
 PORTNAME=	libobjc2
 PORTVERSION=	1.8.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang devel gnustep
 
 MAINTAINER=	theraven@FreeBSD.org
 COMMENT=	Replacement Objective-C runtime supporting modern Objective-C features
 
 SSP_UNSAFE=	yes
 
 USES=		cmake objc:compiler
 BROKEN_powerpc=		Does not compile on powerpc: Unsupported relocation type 10
 BROKEN_sparc64=		Does not compile on sparc64: Cannot configure clang properly
 
 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>
Index: head/lang/libobjc2/pkg-plist
===================================================================
--- head/lang/libobjc2/pkg-plist	(revision 431264)
+++ head/lang/libobjc2/pkg-plist	(revision 431265)
@@ -1,23 +1,20 @@
 include/objc/Availability.h
 include/objc/Object.h
 include/objc/Protocol.h
 include/objc/blocks_private.h
 include/objc/blocks_runtime.h
 include/objc/capabilities.h
 include/objc/developer.h
 include/objc/encoding.h
 include/objc/hooks.h
 include/objc/message.h
 include/objc/objc-api.h
 include/objc/objc-arc.h
 include/objc/objc-auto.h
 include/objc/objc.h
 include/objc/runtime.h
 include/objc/runtime-deprecated.h
 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%%