cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly respect CXX.

Browse Source
This commit is contained in:
ajacoutot 2012-01-03 16:58:38 +00:00
parent 75d9c68b82
commit 9318ffeffe
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/nx/nxproxy/Makefile
View File

@ -1,19 +1,21 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/01/03 16:29:17 sebastia Exp $
# $OpenBSD: Makefile,v 1.2 2012/01/03 16:58:38 ajacoutot Exp $
COMMENT= NX X proxy support tool
DASHVERSION= 1
DISTNAME= nxproxy-${MAJOR_VERSION}-${DASHVERSION}
PKGNAME= nxproxy-${MAJOR_VERSION}.${DASHVERSION}
REVISION= 0
WANTLIB += c m stdc++ Xcomp
LIB_DEPENDS = x11/nx/nxcomp
LIB_DEPENDS= x11/nx/nxcomp
CONFIGURE_STYLE= gnu
MAKE_ENV = CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include/nx" \
MAKE_ENV= CC=${CC} CXX=${CXX} \
CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include/nx" \
CCFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
MAKE_FLAGS = LOCAL_LIBRARIES=${X11BASE}/lib/libXau.a
MAKE_FLAGS= LOCAL_LIBRARIES=${X11BASE}/lib/libXau.a
WRKDIST= ${WRKDIR}/nxproxy

19
x11/nx/nxproxy/patches/patch-Makefile_in
View File

@ -1,13 +1,11 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/01/03 16:29:17 sebastia Exp $
--- Makefile.in.orig Fri Dec 30 14:52:40 2011
+++ Makefile.in Fri Dec 30 14:53:52 2011
@@ -10,20 +10,20 @@ LIBVERSION=@LIBVERSION@
#
$OpenBSD: patch-Makefile_in,v 1.2 2012/01/03 16:58:38 ajacoutot Exp $
--- Makefile.in.orig Sat Jul 16 17:43:17 2005
+++ Makefile.in Tue Jan 3 17:45:00 2012
@@ -11,18 +11,18 @@ LIBVERSION=@LIBVERSION@
# -Wredundant-decls
#
-CXX = @CXX@
CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
+CXX ?= @CXX@
+CXXFLAGS += @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs
@ -15,19 +13,16 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/01/03 16:29:17 sebastia Exp $
-CXXINCLUDES = -I. -I../nxcomp
+CXXINCLUDES += -I. -I../nxcomp
-CC = @CC@
CC = @CC@
-CCFLAGS = $(CXXFLAGS)
-CCINCLUDES = -I. -I../nxcomp
-CCDEFINES =
+CC ?= @CC@
+CCFLAGS += $(CXXFLAGS)
+CCINCLUDES += -I. -I../nxcomp
+CCDEFINES +=
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+LDFLAGS += @LDFLAGS@
+LIBS += @LIBS@
LIBS = @LIBS@
#
# Only if THREADS is defined.