Update to 3.5.0.27

Unbundle nxcomp

5 files changed, 12 insertions, 97 deletions

diff --git a/net/nxproxy/Makefile b/net/nxproxy/Makefile
index d9eae03fa464..4eb35cf53964 100644
--- a/net/nxproxy/Makefile
+++ b/net/nxproxy/Makefile
@@ -2,65 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	nxproxy
-DISTVERSION=	3.4.0-2
-PORTREVISION=	2
+DISTVERSION=	3.5.0.27
 CATEGORIES=	net
-MASTER_SITES=	http://x2go.obviously-nice.de/deb/pool-lenny/nxproxy/:nxproxy \
-		http://x2go.obviously-nice.de/deb/pool-lenny/nxcomp/:nxcomp
-DISTFILES=	nxcomp-${DISTVERSION:S/2/1/}.tar.gz:nxcomp\
-		nxproxy-${DISTVERSION}.tar.gz:nxproxy
+MASTER_SITES=	http://code.x2go.org/releases/source/nx-libs/
+DISTNAME=	nx-libs-${PORTVERSION}-lite
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Helper program for x2go
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libXcomp.so:${PORTSDIR}/x11/nxcomp
+WRKSRC=	${WRKDIR}/nx-libs-${PORTVERSION}/${PORTNAME}
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFLICTS=	nxserver-[0-9]*
-
-USE_XORG=	ice x11 sm
-USE_GCC=	any
 USE_AUTOTOOLS=	autoconf
+PLIST_FILES=	bin/nxproxy \
+		man/man1/nxproxy.1.gz
 
-CPPFLAGS+=	$$(libpng-config --I_opts)
-LDFLAGS+=	$$(libpng-config --L_opts)
-
-PLIST_FILES=	bin/nxproxy bin/setsid
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000
-BROKEN=		Does not link on powerpc-9
-.endif
-
-post-extract:
-	${LN} -sf ${WRKDIR}/nxcomp-${DISTVERSION:S/2/1/} ${WRKDIR}/nxcomp
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/-O3/s|^|#|' ${WRKSRC}/configure.in
-	@${REINPLACE_CMD} -e \
-		'/-O3/s|^|#|' ${WRKDIR}/nxcomp/configure.in
-	@${REINPLACE_CMD} -e \
-		's|-Wpointer-arith|@CPPFLAGS@|' ${WRKDIR}/nxcomp/Makefile.in
-
-pre-configure:
-	cd ${WRKDIR}/nxcomp; ${AUTOCONF}
-	cd ${WRKDIR}/nxcomp; ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} \
-		${CONFIGURE_ARGS} --without-symbols \
-		CC="${CC}" CFLAGS="${CFLAGS}" \
-		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
-pre-build:
-	cd ${WRKDIR}/nxcomp; ${MAKE_ENV} ${MAKE}
-	cd ${WRKSRC}; ${CC} ${CFLAGS} ${FILESDIR}/setsid.c -o setsid
-
-do-install:
-.for i in nxproxy setsid
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin)
-.endfor
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/nxproxy/distinfo b/net/nxproxy/distinfo
index ddba3ac30ef2..511b3f6c17a7 100644
--- a/net/nxproxy/distinfo
+++ b/net/nxproxy/distinfo
@@ -1,4 +1,2 @@
-SHA256 (nxcomp-3.4.0-1.tar.gz) = 155ae68575444cb1cd677c3dd360d2b446e7b56e76f90f83f60dcfe22cc802b9
-SIZE (nxcomp-3.4.0-1.tar.gz) = 535758
-SHA256 (nxproxy-3.4.0-2.tar.gz) = a993591417d8d17dc74eaf5d16e229fa46cf88d17ce8d091ed20aa12dec4fc3a
-SIZE (nxproxy-3.4.0-2.tar.gz) = 80256
+SHA256 (nx-libs-3.5.0.27-lite.tar.gz) = efbf6eed02b5eb2892828e2237dff4591442e96d0ac83f3d75c62a15101d6a27
+SIZE (nx-libs-3.5.0.27-lite.tar.gz) = 513262
diff --git a/net/nxproxy/files/patch-nxcomp-Pgn.cpp b/net/nxproxy/files/patch-nxcomp-Pgn.cpp
deleted file mode 100644
index b59a4619a092..000000000000
--- a/net/nxproxy/files/patch-nxcomp-Pgn.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../nxcomp-3.4.0-1/Pgn.cpp.orig	2007-06-04 15:02:24.000000000 +0200
-+++ ../nxcomp-3.4.0-1/Pgn.cpp	2012-05-06 06:43:28.000000000 +0200
-@@ -29,6 +29,7 @@
- 
- #include "Unpack.h"
- #include "Pgn.h"
-+#include "pngpriv.h"
- 
- #define PANIC
- #define WARNING
diff --git a/net/nxproxy/files/patch-nxcomp-configure.in b/net/nxproxy/files/patch-nxcomp-configure.in
deleted file mode 100644
index f8382cb9c7c7..000000000000
--- a/net/nxproxy/files/patch-nxcomp-configure.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../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
diff --git a/net/nxproxy/files/setsid.c b/net/nxproxy/files/setsid.c
deleted file mode 100644
index 09c711d0e638..000000000000
--- a/net/nxproxy/files/setsid.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <unistd.h>
-int main(int argc,char** argv)
-{
-    setsid();
-    execvp(argv[1], argv+1);
-    return 0;
-}