Date: Tue, 8 Oct 2013 02:50:56 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/182799: net/nxproxy: Fix build on 10-current Message-ID: <20131008025056.782c9ec03223d4b7a006d3ec@yahoo.com> Resent-Message-ID: <201310071810.r97IA1Pl058006@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182799
>Category: ports
>Synopsis: net/nxproxy: Fix build on 10-current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 07 18:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Fix build on 10-current
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net/nxproxy/Makefile net/nxproxy/Makefile
--- /usr/ports/net/nxproxy/Makefile 2013-09-22 00:27:05.000000000 +0900
+++ net/nxproxy/Makefile 2013-10-08 00:00:00.000000000 +0900
@@ -11,22 +11,24 @@
nxproxy-${DISTVERSION}.tar.gz:nxproxy
MAINTAINER= ports@FreeBSD.org
-COMMENT= An x2go helper program
+COMMENT= Helper program for x2go
+
+LICENSE= GPLv2
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/LICENSE
CONFLICTS= nxserver-[0-9]*
-GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf
+
USE_XORG= ice x11 sm
-CXXFLAGS+= -I${LOCALBASE}/include/libpng15
-CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
+USE_GCC= any
+USE_AUTOTOOLS= autoconf
+
+CPPFLAGS+= $$(libpng-config --I_opts)
+LDFLAGS+= $$(libpng-config --L_opts)
+
PLIST_FILES= bin/nxproxy bin/setsid
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000
@@ -37,24 +39,28 @@
${LN} -sf ${WRKDIR}/nxcomp-${DISTVERSION:S/2/1/} ${WRKDIR}/nxcomp
post-patch:
- ${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.in
-.if ${OSVERSION} < 700000
- ${REINPLACE_CMD} -e "s,result = unsetenv,unsetenv," ${WRKDIR}/nxcomp/Children.cpp
-.endif
+ @${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};
+ 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:
- ${INSTALL_PROGRAM} ${WRKSRC}/nxproxy ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/setsid ${PREFIX}/bin
+.for i in nxproxy setsid
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin)
+.endfor
.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131008025056.782c9ec03223d4b7a006d3ec>