diff options
author | Tilman Keskinoz <arved@FreeBSD.org> | 2011-06-21 13:11:17 +0000 |
---|---|---|
committer | Tilman Keskinoz <arved@FreeBSD.org> | 2011-06-21 13:11:17 +0000 |
commit | 95477e3d51550b17625cc0742b0882d4b1e1122b (patch) | |
tree | 13f30c3299b90e00ee071301ec5b14d03da66560 /net | |
parent | 4d443ed3acefbcfc13ae11b9bb8f3d9eead06790 (diff) | |
download | ports-95477e3d51550b17625cc0742b0882d4b1e1122b.tar.gz ports-95477e3d51550b17625cc0742b0882d4b1e1122b.zip |
Notes
Diffstat (limited to 'net')
-rw-r--r-- | net/nxproxy/Makefile | 8 | ||||
-rw-r--r-- | net/nxproxy/files/patch-nxcomp-configure.in | 23 |
2 files changed, 28 insertions, 3 deletions
diff --git a/net/nxproxy/Makefile b/net/nxproxy/Makefile index 228ea27fd8da..d01cfadea538 100644 --- a/net/nxproxy/Makefile +++ b/net/nxproxy/Makefile @@ -23,6 +23,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS= nxserver-[0-9]* GNU_CONFIGURE= yes +USE_AUTOTOOLS= autoconf USE_XORG= ice x11 sm PLIST_FILES= bin/nxproxy bin/setsid @@ -32,15 +33,16 @@ post-extract: ${LN} -sf ${WRKDIR}/nxcomp-${DISTVERSION:S/2/1/} ${WRKDIR}/nxcomp post-patch: - ${REINPLACE_CMD} -e "s,-O3,${CFLAGS}," ${WRKSRC}/configure \ - ${WRKDIR}/nxcomp/configure + ${REINPLACE_CMD} -e "s,-O3,${CFLAGS}," ${WRKSRC}/configure.in \ + ${WRKDIR}/nxcomp/configure.in ${REINPLACE_CMD} -e "s,-lXcomp, -L${PREFIX}/lib -lpng -ljpeg ../nxcomp/libXcomp.a," \ - ${WRKSRC}/configure + ${WRKSRC}/configure.in .if ${OSVERSION} < 700000 ${REINPLACE_CMD} -e "s,result = unsetenv,unsetenv," ${WRKDIR}/nxcomp/Children.cpp .endif pre-configure: + cd ${WRKDIR}/nxcomp; ${AUTOCONF} cd ${WRKDIR}/nxcomp; ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; pre-build: diff --git a/net/nxproxy/files/patch-nxcomp-configure.in b/net/nxproxy/files/patch-nxcomp-configure.in new file mode 100644 index 000000000000..f8382cb9c7c7 --- /dev/null +++ b/net/nxproxy/files/patch-nxcomp-configure.in @@ -0,0 +1,23 @@ +--- ../nxcomp/configure.in.orig 2011-06-21 15:06:20.000000000 +0200 ++++ ../nxcomp/configure.in 2011-06-21 15:07:01.000000000 +0200 +@@ -5,11 +5,6 @@ + AC_INIT(NX.h) + AC_PREREQ(2.13) + +-dnl Set our default compilation flags. +- +-CXXFLAGS="-O3 -fno-rtti -fno-exceptions" +-CFLAGS="-O3" +- + dnl Reset default linking directives. + + LIBSTATIC="" +@@ -49,7 +44,7 @@ + dnl Check for programs. + + AC_PROG_CXX +-AC_PROG_CC ++AC_PROG_CC([clang gcc cc]) + AC_LANG_CPLUSPLUS + + dnl Check whether option -Wno-deprecated |