svn commit: r322315 - in head/net/appkonference: . files

[Tijl Coosemans]

Author: tijl
Date: Fri Jul  5 08:09:44 2013
New Revision: 322315
URL: http://svnweb.freebsd.org/changeset/ports/322315

Log:
  Fix build with clang (USE_CSTD=gnu89) and respect CFLAGS, CPPFLAGS
  and LDFLAGS.
  
  Approved by:	maintainer timeout (20 days)

Modified:
  head/net/appkonference/Makefile
  head/net/appkonference/files/patch-Makefile
Directory Properties:
  head/net/appkonference/pkg-descr   (props changed)

Modified: head/net/appkonference/Makefile
==============================================================================
--- head/net/appkonference/Makefile	Fri Jul  5 07:54:03 2013	(r322314)
+++ head/net/appkonference/Makefile	Fri Jul  5 08:09:44 2013	(r322315)
@@ -16,6 +16,7 @@ COMMENT=	High-performance Asterisk voice
 BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
 RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
 
+USE_CSTD=	gnu89
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}/konference
 

Modified: head/net/appkonference/files/patch-Makefile
==============================================================================
--- head/net/appkonference/files/patch-Makefile	Fri Jul  5 07:54:03 2013	(r322314)
+++ head/net/appkonference/files/patch-Makefile	Fri Jul  5 08:09:44 2013	(r322315)
@@ -27,3 +27,30 @@
  
  # module release
  RELEASE = 2.1
+@@ -86,7 +86,7 @@
+ # compiler flags
+ #
+ 
+-CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations -MD -MP $(DEBUG)
++CFLAGS += -pipe -Wall -Wmissing-prototypes -Wmissing-declarations -MD -MP $(DEBUG)
+ #CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math
+ # PERF: below is 10% faster than -O2 or -O3 alone.
+ #CFLAGS += -O3 -ffast-math -funroll-loops
+@@ -103,7 +103,7 @@
+ # preprocessor flags
+ #
+ 
+-CPPFLAGS = $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
++CPPFLAGS += $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
+ CPPFLAGS += -DRELEASE=\"$(RELEASE)\"
+ CPPFLAGS += -DASTERISK=$(ASTERISK)
+ CPPFLAGS += -DCHANNEL_TABLE_SIZE=$(CHANNEL_TABLE_SIZE)
+@@ -182,7 +182,7 @@
+ $(OBJS): $(INCS)
+ 
+ $(TARGET): $(OBJS)
+-	$(CC) $(SOLINK) -o $@ $(OBJS)
++	$(CC) $(LDFLAGS) $(SOLINK) -o $@ $(OBJS)
+ 
+ install:
+ 	$(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR)