Date: Sun, 27 Sep 2015 21:38:17 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398054 - in head/net/boinc-client: . files Message-ID: <201509272138.t8RLcHbi093196@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sun Sep 27 21:38:16 2015 New Revision: 398054 URL: https://svnweb.freebsd.org/changeset/ports/398054 Log: - Implement clean deinstallation - Drop 8.x support - Switch to options helpers Added: head/net/boinc-client/files/pkg-deinstall.in (contents, props changed) Modified: head/net/boinc-client/Makefile Modified: head/net/boinc-client/Makefile ============================================================================== --- head/net/boinc-client/Makefile Sun Sep 27 21:32:30 2015 (r398053) +++ head/net/boinc-client/Makefile Sun Sep 27 21:38:16 2015 (r398054) @@ -23,7 +23,7 @@ BOINC_CLIENT_USER?= boinc BOINC_CLIENT_GROUP?= boinc BOINC_CLIENT_HOME?= /var/db/boinc -SUB_FILES= pkg-install +SUB_FILES= pkg-install pkg-deinstall SUB_LIST= BOINC_CLIENT_HOME="${BOINC_CLIENT_HOME}" \ BOINC_CLIENT_USER="${BOINC_CLIENT_USER}" \ BOINC_CLIENT_GROUP="${BOINC_CLIENT_GROUP}" \ @@ -74,10 +74,6 @@ X11_CONFIGURE_OFF= ax_cv_check_glut_libg .if ${PORT_OPTIONS:MMANAGER} WX_CONF_ARGS= absolute -WX_UNICODE= yes -. if ${OSVERSION} < 900506 || (${OSVERSION} >= 1000000 && ${OSVERSION} < 1000002) -CPPFLAGS+= -DNO_PER_THREAD_LOCALE -. endif SUB_LIST+= OPTION_MANAGER="true" .else SUB_LIST+= OPTION_MANAGER="" @@ -114,35 +110,33 @@ post-patch: ${WRKSRC}/zip/zip/zipup.c post-install: -.if ${PORT_OPTIONS:MMANAGER} || ${PORT_OPTIONS:MX11} +.for 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 +.endfor + +post-install-MANAGER-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/boinc -.endif -.if ${PORT_OPTIONS:MMANAGER} -. for name in 16 32 48 +.for name in 16 32 48 ${INSTALL_DATA} ${WRKSRC}/clientgui/res/boincmgr.${name}x${name}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps -. endfor -. if ${PORT_OPTIONS:MSKINS} +.endfor +.if ${PORT_OPTIONS:MSKINS} (cd ${WRKSRC}/clientgui && \ ${COPYTREE_SHARE} skins ${STAGEDIR}${PREFIX}/share/boinc/ ) -. else +.else ${MKDIR} ${STAGEDIR}${PREFIX}/share/boinc/skins (cd ${WRKSRC}/clientgui/skins && \ ${COPYTREE_SHARE} Default ${STAGEDIR}${PREFIX}/share/boinc/skins/ ) -. endif .endif -. for 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 -. endfor -.if ${PORT_OPTIONS:MX11} -. for name in api/boinc_gl.h api/graphics_api.h api/graphics_data.h \ + +post-install-X11-on: +.for 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 -. endfor +.endfor ${MKDIR} ${STAGEDIR}${PREFIX}/share/boinc/ttf (cd ${WRKSRC}/api/ttf/liberation-fonts-ttf-2.00.0 && \ ${COPYTREE_SHARE} \*.ttf ${STAGEDIR}${PREFIX}/share/boinc/ttf/ ) -.endif .include <bsd.port.mk> Added: head/net/boinc-client/files/pkg-deinstall.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/boinc-client/files/pkg-deinstall.in Sun Sep 27 21:38:16 2015 (r398054) @@ -0,0 +1,28 @@ +#!/bin/sh +# +# $FreeBSD: head/net/boinc-client/files/pkg-install.in 325489 2013-08-27 21:37:47Z rene $ +# + +PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin + +user=%%BOINC_CLIENT_USER%% +group=%%BOINC_CLIENT_GROUP%% +home="%%BOINC_CLIENT_HOME%%" +option_manager=%%OPTION_MANAGER%% +option_user=%%OPTION_USER%% + +case $2 in +POST-DEINSTALL) + if [ -n "${option_user}" ] ; then + if [ -n "${option_manager}" -a -e "${home}/skins" -a `readlink "${home}/skins"` = "%%PREFIX%%/share/boinc/skins" ]; then + rm -f "${home}/skins" + fi + if [ -e "${home}/ca-bundle.crt" -a `readlink "${home}/ca-bundle.crt"` = "%%LOCALBASE%%/share/certs/ca-root-nss.crt" ]; then + rm -f "${home}/ca-bundle.crt" + fi + rmdir "${home}" >/dev/null 2>&1 + fi + ;; +esac + +exit 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509272138.t8RLcHbi093196>