aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/nxproxy/Makefile5
-rw-r--r--net/nxproxy/files/setsid.c (renamed from net/x2goclient-cli/files/setsid.c)0
-rw-r--r--net/x2goclient-cli/Makefile8
3 files changed, 7 insertions, 6 deletions
diff --git a/net/nxproxy/Makefile b/net/nxproxy/Makefile
index 9119fef9f4ce..228ea27fd8da 100644
--- a/net/nxproxy/Makefile
+++ b/net/nxproxy/Makefile
@@ -6,6 +6,7 @@
PORTNAME= nxproxy
DISTVERSION= 3.4.0-2
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://x2go.obviously-nice.de/deb/pool-lenny/nxproxy/:nxproxy \
http://x2go.obviously-nice.de/deb/pool-lenny/nxcomp/:nxcomp
@@ -23,7 +24,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
CONFLICTS= nxserver-[0-9]*
GNU_CONFIGURE= yes
USE_XORG= ice x11 sm
-PLIST_FILES= bin/nxproxy
+PLIST_FILES= bin/nxproxy bin/setsid
.include <bsd.port.pre.mk>
@@ -44,8 +45,10 @@ pre-configure:
pre-build:
cd ${WRKDIR}/nxcomp; ${MAKE_ENV} ${MAKE}
+ cd ${WRKSRC}; ${CC} ${CFLAGS} ${FILESDIR}/setsid.c -o setsid
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nxproxy ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/setsid ${PREFIX}/bin
.include <bsd.port.post.mk>
diff --git a/net/x2goclient-cli/files/setsid.c b/net/nxproxy/files/setsid.c
index 09c711d0e638..09c711d0e638 100644
--- a/net/x2goclient-cli/files/setsid.c
+++ b/net/nxproxy/files/setsid.c
diff --git a/net/x2goclient-cli/Makefile b/net/x2goclient-cli/Makefile
index 6c371d78b883..fc342caac57d 100644
--- a/net/x2goclient-cli/Makefile
+++ b/net/x2goclient-cli/Makefile
@@ -6,6 +6,7 @@
PORTNAME= x2goclient-cli
DISTVERSION= 3.0.1-1.2
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://x2go.obviously-nice.de/deb/pool-lenny/x2goclient-cli/
DISTNAME= ${PORTNAME}_${DISTVERSION}
@@ -20,14 +21,11 @@ RUN_DEPENDS= ${SITE_PERL}/Proc/Simple.pm:${PORTSDIR}/devel/p5-Proc-Simple \
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_PERL5= yes
-PLIST_FILES= bin/x2goclient-cli bin/setsid
+PLIST_FILES= bin/x2goclient-cli
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:S,-1.2,,}
-
-do-build:
- cd ${WRKSRC}; ${CC} ${CFLAGS} ${FILESDIR}/setsid.c -o setsid
+NO_BUILD= yes
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/x2goclient-cli ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/setsid ${PREFIX}/bin
.include <bsd.port.mk>