Date: Fri, 29 Nov 2013 07:08:42 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335147 - head/net/x11vnc Message-ID: <201311290708.rAT78gG3019643@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Fri Nov 29 07:08:42 2013 New Revision: 335147 URL: http://svnweb.freebsd.org/changeset/ports/335147 Log: - use STAGEDIR Modified: head/net/x11vnc/Makefile head/net/x11vnc/pkg-plist Modified: head/net/x11vnc/Makefile ============================================================================== --- head/net/x11vnc/Makefile Fri Nov 29 06:56:00 2013 (r335146) +++ head/net/x11vnc/Makefile Fri Nov 29 07:08:42 2013 (r335147) @@ -12,11 +12,9 @@ COMMENT= VNC server for use with real X LICENSE= GPLv2 -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - dbus:${PORTSDIR}/devel/dbus \ - pthread-stubs:${PORTSDIR}/devel/libpthread-stubs - -NO_STAGE= yes +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libdbus-1.so:${PORTSDIR}/devel/dbus \ + libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs USE_XORG= x11 xcb xdamage xfixes xrandr xinerama xext xtst xau xrender \ xdmcp recordproto @@ -27,36 +25,28 @@ USES= iconv pkgconfig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -MAN1= x11vnc.1 PORTDOCS= AUTHORS COPYING ChangeLog NEWS README README.LibVNCServer TODO OPTIONS_DEFINE=NLS AVAHI OPTIONS_DEFAULT=NLS AVAHI NO_OPTIONS_SORT=yes +NLS_USES= gettext +AVAHI_LIB_DEPENDS= libavahi-common.so:${PORTSDIR}/net/avahi-app +AVAHI_CONFIGURE_OFF= --without-avahi .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -.endif - -.if ${PORT_OPTIONS:MAVAHI} -LIB_DEPENDS+= avahi-common:${PORTSDIR}/net/avahi-app -.else -CONFIGURE_ARGS+= --without-avahi -.endif - post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ + ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|include_HEADERS = |noinst_HEADERS = |' \ + ${REINPLACE_CMD} -e 's|include_HEADERS = |noinst_HEADERS = |' \ -e 's|am__include_HEADERS_DIST|am__noinst_HEADERS_DIST|' \ -e 's|/include/rfb|/include|' ${WRKSRC}/Makefile.in -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .endif .include <bsd.port.mk> Modified: head/net/x11vnc/pkg-plist ============================================================================== --- head/net/x11vnc/pkg-plist Fri Nov 29 06:56:00 2013 (r335146) +++ head/net/x11vnc/pkg-plist Fri Nov 29 07:08:42 2013 (r335147) @@ -1,4 +1,5 @@ bin/x11vnc +man/man1/x11vnc.1.gz %%DATADIR%%/classes/ssl/README %%DATADIR%%/classes/ssl/SignedUltraViewerSSL.jar %%DATADIR%%/classes/ssl/SignedVncViewer.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311290708.rAT78gG3019643>