ports/185035: net-im/jabberd wants lang/clang33 in spite of clang 3.3 in base

[Pavel Gubin]

>Number:         185035
>Category:       ports
>Synopsis:       net-im/jabberd wants lang/clang33 in spite of clang 3.3 in base
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 20 16:40:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Pavel Gubin
>Release:        9.2-RELEASE
>Organization:
Lazy
>Environment:
FreeBSD qub.2lazy.ru 9.2-RELEASE-p2 FreeBSD 9.2-RELEASE-p2 #2 r258764: Sun Dec  1 13:57:27 MSK 2013     pg at qub.2lazy.ru:/usr/obj/usr/src/sys/Qub  amd64
>Description:
When trying to upgrade net-im/jabberd, ports says that it wants to install lang/clang33, while clang 3.3. present in base system 9.2

Seems that /usr/ports/Mk/Uses/compiler.mk lacks check for clang 3.3 in base for "compiler:c11" while this check exists for "compiler:c++11"
>How-To-Repeat:
Try to build net-im/jabberd
>Fix:


Patch attached with submission follows:

--- compiler.mk.orig	2013-12-16 03:45:39.000000000 +0400
+++ compiler.mk	2013-12-20 20:21:20.000000000 +0400
@@ -162,6 +162,12 @@
 USE_GCC=	4.7+
 CHOSEN_COMPILER_TYPE=	gcc
 .elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc
+.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33
+CPP=	clang-cpp
+CC=	clang
+CXX=	clang++
+CHOSEN_COMPILER_TYPE=	clang
+.else
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33
 CHOSEN_COMPILER_TYPE=	clang
 CPP=	${LOCALBASE}/bin/clang-cpp33
@@ -174,5 +180,6 @@
 .endif
 .endif
 .endif
+.endif
 
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted: