Date: Sun, 14 Jan 2018 11:25:54 -0600 From: Larry Rosenman <ler@lerctr.org> To: freebsd-ports@FreeBSD.org Subject: WRKSRC/WRKSRC_SUBDIR/USE_GITHUB Message-ID: <20180114172554.pqoztu6aswqal5rv@ler-imac.local>
next in thread | raw e-mail | index | archive | help
--gcakr7hlij2u7ndq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Greetings, I'm (finally) getting around to updating net/boinc-client, and=20 when I changed it to use USE_GITHUB, I get the following warning: You are using USE_GITHUB and WRKSRC is set which is wrong. Set GH_PROJECT correctly, set WRKSRC_SUBDIR or remove WRKSRC entirely. But if I don't set WRKSRC, the patches, etc don't work. =20 Ideas? New Makefile: # Created by: J.R. Oldroyd <fbsd@opal.com> # $FreeBSD: head/net/boinc-client/Makefile 441503 2017-05-23 05:03:14Z rezn= y $ PORTNAME=3D boinc-client PORTVERSION=3D 7.8.6 CATEGORIES=3D net #MASTER_SITES=3D LOCAL/rene MAINTAINER=3D ler@FreeBSD.org COMMENT=3D Berkeley Open Infrastructure for Network Computing client LICENSE=3D LGPL3 LIB_DEPENDS+=3D libfreetype.so:print/freetype2 USES=3D autoreconf dos2unix gettext gmake libtool pkgconfig ssl tar:xz USE_XORG+=3D x11 xscrnsaver INSTALL_TARGET=3D install-strip GNU_CONFIGURE=3D yes USE_GITHUB=3D yes GH_ACCOUNT=3D BOINC GH_PROJECT=3D boinc GH_TAGNAME=3D client_release/7.8/${PORTVERSION} USE_LDCONFIG=3D yes DOS2UNIX_GLOB=3D *.xpm WRKSRC=3D ${WRKDIR} WRKSRC_SUBDIR=3D boinc-client_release-7.8-${PORTVERSION} USERS=3D boinc GROUPS=3D boinc BOINC_CLIENT_USER?=3D boinc BOINC_CLIENT_GROUP?=3D boinc BOINC_CLIENT_HOME?=3D /var/db/boinc SUB_FILES=3D pkg-install pkg-deinstall SUB_LIST=3D BOINC_CLIENT_HOME=3D"${BOINC_CLIENT_HOME}" \ BOINC_CLIENT_USER=3D"${BOINC_CLIENT_USER}" \ BOINC_CLIENT_GROUP=3D"${BOINC_CLIENT_GROUP}" \ PREFIX=3D"${PREFIX}" LOCALBASE=3D"${LOCALBASE}" CONFIGURE_ARGS=3D --disable-server CONFIGURE_ENV=3D OBJCXX=3D"${CXX}" CPPFLAGS+=3D -I${LOCALBASE}/include LDFLAGS+=3D -L${LOCALBASE}/lib -lexecinfo OPTIONS_DEFINE=3D CLIENT MANAGER NLS X11 LINUX USER SKINS OPTIONS_DEFAULT=3D CLIENT MANAGER X11 USER OPTIONS_GROUP=3D SCRIPT OPTIONS_GROUP_SCRIPT=3D NO_GUI_RPC NO_NET_INFO CLIENT_DESC=3D Build BOINC client MANAGER_DESC=3D Build BOINC manager GUI X11_DESC=3D Build graphics API LINUX_DESC=3D Accept Linux science applications USER_DESC=3D Create/check BOINC client user and directory SKINS_DESC=3D Install more skins for BOINC manager SCRIPT_DESC=3D Command line options in script NO_GUI_RPC_DESC=3D Disable GUI RPC and socket (breaks boinc_curses) NO_NET_INFO_DESC=3D Do not send host address and name to servers OPTIONS_SUB=3D yes MANAGER_USES=3D iconv MANAGER_LIB_DEPENDS=3D libnotify.so:devel/libnotify \ libsqlite3.so:databases/sqlite3 MANAGER_CONFIGURE_ON=3D --with-sqlite3-prefix=3D${LOCALBASE} MANAGER_CONFIGURE_OFF=3D --with-wx-config=3Dfalse --without-x MANAGER_CONFIGURE_ENABLE=3Dmanager MANAGER_USE=3D XORG=3Dx11,xext,xscrnsaver WX=3D2.8 CLIENT_CONFIGURE_ENABLE=3Dclient CLIENT_LIB_DEPENDS=3D libcurl.so:ftp/curl CLIENT_RUN_DEPENDS=3D ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_= root_nss CLIENT_USE=3D RC_SUBR=3Dboinc-client LINUX_CONFIGURE_ON=3D --with-boinc-alt-platform=3Di686-pc-linux-gnu LINUX_USES=3D linux X11_USES=3D jpeg X11_USE=3D GL=3Dglut XORG=3Dxmu,xi X11_CONFIGURE_OFF=3D ax_cv_check_glut_libglut=3Dno =2Einclude <bsd.port.options.mk> =2Eif ${PORT_OPTIONS:MMANAGER} WX_CONF_ARGS=3D absolute SUB_LIST+=3D OPTION_MANAGER=3D"true" =2Eelse SUB_LIST+=3D OPTION_MANAGER=3D"" =2Eendif =2Eif ${PORT_OPTIONS:MCLIENT} SUB_LIST+=3D OPTION_NO_GUI_RPC=3D${PORT_OPTIONS:MNO_GUI_RPC:S/^NO_GUI_RPC$/= --no_gui_rpc/} \ OPTION_NO_NET_INFO=3D${PORT_OPTIONS:MNO_NET_INFO:S/^NO_NET_INFO$/--suppre= ss_net_info/} =2Eendif =2Eif ${PORT_OPTIONS:MUSER} SUB_LIST+=3D OPTION_USER=3D"true" =2Eelse SUB_LIST+=3D OPTION_USER=3D"" =2Eendif post-patch: @${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|' \ ${WRKSRC}/client/hostinfo_unix.cpp @${REINPLACE_CMD} -e 's|client/scripts||' ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e 's|$$$$mydir/$$$$ldir|&/LC_MESSAGES|' \ ${WRKSRC}/locale/Makefile.am # avoid build conflict with archivers/libzip @${MV} ${WRKSRC}/zip/unzip/zip.h ${WRKSRC}/zip/unzip/boinczip.h @${MV} ${WRKSRC}/zip/zip/zip.h ${WRKSRC}/zip/zip/boinczip.h @${REINPLACE_CMD} -e 's|zip/zip.h|zip/boinczip.h|' \ ${WRKSRC}/zip/boinc_zip.cpp @${REINPLACE_CMD} -e 's|"zip.h"|"boinczip.h"|' \ ${WRKSRC}/zip/unzip/crc32.c ${WRKSRC}/zip/unzip/ttyio.c \ ${WRKSRC}/zip/zip/deflate.c ${WRKSRC}/zip/zip/trees.c \ ${WRKSRC}/zip/zip/unix/z_unix.c ${WRKSRC}/zip/zip/util.c \ ${WRKSRC}/zip/zip/z_fileio.c ${WRKSRC}/zip/zip/z_globals.c \ ${WRKSRC}/zip/zip/zip.c ${WRKSRC}/zip/zip/zipfile.c \ ${WRKSRC}/zip/zip/zipup.c post-install: =2Efor name in config.h project_specific_defines.h api/reduce.h \ lib/opencl_boinc.h lib/shmem.h lib/std_fixes.h ${INSTALL_DATA} ${WRKSRC}/${name} ${STAGEDIR}${PREFIX}/include/boinc =2Eendfor post-install-MANAGER-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/boinc =2Efor name in 16 32 48 ${INSTALL_DATA} ${WRKSRC}/clientgui/res/boincmgr.${name}x${name}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps =2Eendfor =2Eif ${PORT_OPTIONS:MSKINS} (cd ${WRKSRC}/clientgui && \ ${COPYTREE_SHARE} skins ${STAGEDIR}${PREFIX}/share/boinc/ ) =2Eelse ${MKDIR} ${STAGEDIR}${PREFIX}/share/boinc/skins (cd ${WRKSRC}/clientgui/skins && \ ${COPYTREE_SHARE} Default ${STAGEDIR}${PREFIX}/share/boinc/skins/ ) =2Eendif post-install-X11-on: =2Efor name in api/boinc_gl.h api/graphics_api.h api/graphics_data.h \ api/ttfont.h ${INSTALL_DATA} ${WRKSRC}/${name} ${STAGEDIR}${PREFIX}/include/boinc =2Eendfor ${MKDIR} ${STAGEDIR}${PREFIX}/share/boinc/ttf (cd ${WRKSRC}/api/ttf/liberation-fonts-ttf-2.00.0 && \ ${COPYTREE_SHARE} \*.ttf ${STAGEDIR}${PREFIX}/share/boinc/ttf/ ) =2Einclude <bsd.port.mk> --=20 Larry Rosenman http://www.lerctr.org/~ler Phone: +1 214-642-9640 E-Mail: ler@lerctr.org US Mail: 5708 Sabbia Drive, Round Rock, TX 78665-2106 --gcakr7hlij2u7ndq Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFgBAABCgBKFiEEHjgknedhWzvJgwVzaXyZsatIp30FAlpbkqIsFIAAAAAAFQAO cGthLWFkZHJlc3NAZ251cGcub3JnbGVyQGxlcmN0ci5vcmcACgkQaXyZsatIp336 jAgAoeLiE2J3FhG2SSvDsHoeXCKeRuamjlmYugMI/aQzTy4d2JiSuH/MbduIYSJn UdEqzbbwuT9O92VolAxuKIHxcNz8Zith1wFQ9uR1xtHWWiGg5wUkk2dusIGjVRVE bhvURUucLb/1RG53PjKaqBDxoIYztfpPAXn2Fx3amrlQHOQCAMYs5qaIPQPEvwZh m+8YWBr2FDDaJkeunw/h0X2WACYRgtv616/k8FBZTnsrcZ27RaTbDvIshxVatyZG BKWVXIXsFv36PSEAku0LBBUmqAhGlKpxucYsbqW/aP6jWZuun2/d1XQcd4+wsi9h +V0gI+YUIg9k5aYQxiGrclwXAw== =ti2I -----END PGP SIGNATURE----- --gcakr7hlij2u7ndq--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180114172554.pqoztu6aswqal5rv>