Date: Sat, 6 Sep 2014 15:15:45 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367443 - head/net/cvsup Message-ID: <201409061515.s86FFjdM051605@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Sep 6 15:15:45 2014 New Revision: 367443 URL: http://svnweb.freebsd.org/changeset/ports/367443 QAT: https://qat.redports.org/buildarchive/r367443/ Log: Use OPTIONS_EXCLUDE_amd64 rather than marking it IGNORE on amd64 with the default options. Modified: head/net/cvsup/Makefile Modified: head/net/cvsup/Makefile ============================================================================== --- head/net/cvsup/Makefile Sat Sep 6 15:10:18 2014 (r367442) +++ head/net/cvsup/Makefile Sat Sep 6 15:15:45 2014 (r367443) @@ -15,17 +15,16 @@ COMMENT= File distribution system optimi ONLY_FOR_ARCHS= amd64 i386 sparc64 OPTIONS_DEFINE= X11 STATIC -OPTIONS_DEFAULT= X11 +OPTIONS_DEFAULT=X11 +OPTIONS_EXCLUDE_amd64= X11 -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MSTATIC} WITH_STATIC= yes M3FLAGS+= -DSTATIC .endif -.include <bsd.port.pre.mk> - .if ${ARCH} == "amd64" TARGET= FBSD_AMD64 AMD64_PATCHES= p-amd64-aa p-amd64-zlib @@ -43,15 +42,11 @@ COMMENT+= (non-GUI version) DESCR= ${PKGDIR}/pkg-descr.nogui CONFLICTS= cvsup-[0-9]* .else -.if ${ARCH} == "amd64" -IGNORE= does not support GUI on amd64, please disable X11 option or use net/cvsup-without-gui instead -.else USE_XORG+= oldx dmx pixman xaw COMMENT+= (GUI version) BUILD_DEPENDS= ${PREFIX}/lib/m3/pkg/formsvbt/${TARGET}/libm3formsvbt.a:${PORTSDIR}/lang/ezm3 CONFLICTS= cvsup-without-gui-[0-9]* .endif -.endif MAKE_ARGS+= PREFIX=${PREFIX} M3FLAGS="${M3FLAGS}" INSTALL_TARGET= install BINDIR=${STAGEDIR}${PREFIX}/bin MANDIR=${STAGEDIR}${MANPREFIX}/man @@ -59,13 +54,13 @@ INSTALL_TARGET= install BINDIR=${STAGEDI pre-patch: .if ${ARCH} == "amd64" .for f in ${AMD64_PATCHES} - @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/${f} + @(cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/${f}) .endfor .endif post-install: - ${MV} ${STAGEDIR}${PREFIX}/bin/cvsupd ${STAGEDIR}${PREFIX}/sbin/ + ${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/cvsupd ${STAGEDIR}${PREFIX}/sbin @${MKDIR} ${STAGEDIR}${PREFIX}/share/cvsup - @${INSTALL_DATA} ${WRKSRC}/License ${STAGEDIR}${PREFIX}/share/cvsup/License + ${INSTALL_DATA} ${WRKSRC}/License ${STAGEDIR}${PREFIX}/share/cvsup/License .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409061515.s86FFjdM051605>