Date: Thu, 25 Dec 2014 01:10:20 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375500 - in head: . Mk Mk/Scripts misc misc/gnomehier Message-ID: <201412250110.sBP1AK8u064571@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Dec 25 01:10:19 2014 New Revision: 375500 URL: https://svnweb.freebsd.org/changeset/ports/375500 QAT: https://qat.redports.org/buildarchive/r375500/ Log: Remove now useless gnomehier, pkg handles automatically the directories where needed making gnomehier entirely useless now. Differential Revision: https://reviews.freebsd.org/D1355 Reviewed by: antoine, kwm Approved by: gnome (kwm) Deleted: head/misc/gnomehier/ Modified: head/MOVED head/Mk/Scripts/check-stagedir.sh head/Mk/bsd.gnome.mk head/Mk/bsd.port.mk head/misc/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Thu Dec 25 00:51:54 2014 (r375499) +++ head/MOVED Thu Dec 25 01:10:19 2014 (r375500) @@ -7329,3 +7329,4 @@ www/drupal7-jailadmin||2014-12-20|Remove www/drupal7-vulnscan||2014-12-20|Removed per author's request; unmaintained www/neon29|www/neon|2014-12-24|Rename to reflect upstream graphics/pornview||2014-12-24|No more upstream, no more public distfile, no proper support for modern png +misc/gnomehier||2014-12-25|Uneeded anymore Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Thu Dec 25 00:51:54 2014 (r375499) +++ head/Mk/Scripts/check-stagedir.sh Thu Dec 25 01:10:19 2014 (r375500) @@ -173,11 +173,7 @@ parse_mtree() { fi listmtree "${PORTSDIR}/Templates/BSD.local.dist" "${LOCALBASE}" - if [ -n "${GNOME_MTREE_FILE}" ] && \ - [ -f "${GNOME_MTREE_FILE}" ]; then - listmtree "${GNOME_MTREE_FILE}" "${PREFIX}" - fi - unset MTREE_FILE GNOME_MTREE_FILE + unset MTREE_FILE # Add LOCALBASE a=${LOCALBASE} @@ -361,7 +357,7 @@ esac # validate environment envfault= -for i in STAGEDIR PREFIX LOCALBASE WRKDIR WRKSRC MTREE_FILE GNOME_MTREE_FILE \ +for i in STAGEDIR PREFIX LOCALBASE WRKDIR WRKSRC MTREE_FILE \ TMPPLIST PLIST_SUB_SED SCRIPTSDIR \ PORT_OPTIONS NO_PREFIX_RMDIR do Modified: head/Mk/bsd.gnome.mk ============================================================================== --- head/Mk/bsd.gnome.mk Thu Dec 25 00:51:54 2014 (r375499) +++ head/Mk/bsd.gnome.mk Thu Dec 25 01:10:19 2014 (r375500) @@ -69,7 +69,7 @@ Gnome_Pre_Include= bsd.gnome.mk # non-version specific components _USE_GNOME_ALL= esound intlhack intltool introspection \ - gnomehack referencehack gnomehier gnomemimedata \ + gnomehack referencehack gnomemimedata \ gnomeprefix # GNOME 1 components @@ -118,10 +118,6 @@ gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} - referencehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} -e \ "s|test \"\$$\$$installfiles\" = '\$$(srcdir)/html/\*'|:|" -GNOME_MTREE_FILE?= ${LOCALBASE}/etc/mtree/BSD.gnome.dist -gnomehier_DETECT= ${GNOME_MTREE_FILE} -gnomehier_RUN_DEPENDS= ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier - GNOME_HTML_DIR?= ${PREFIX}/share/doc GCONF_CONFIG_OPTIONS?= merged GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults @@ -754,14 +750,11 @@ CONFIGURE_FAIL_MESSAGE= "Please run the .if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) || defined(INSTALLS_ICONS) \ - || defined(GLIB_SCHEMAS) || (defined(_USE_GNOME) && ${_USE_GNOME:Mgnomehier}!="") + || defined(GLIB_SCHEMAS) pre-su-install: gnome-pre-su-install post-install: gnome-post-install gnome-pre-su-install: -.if defined(_USE_GNOME) && ${_USE_GNOME:Mgnomehier}!="" && !defined(NO_MTREE) - @${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${STAGEDIR}${PREFIX}/ >/dev/null -.endif .if defined(GCONF_SCHEMAS) @${MKDIR} ${STAGEDIR}${PREFIX}/etc/gconf/gconf.xml.defaults/ .else Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Dec 25 00:51:54 2014 (r375499) +++ head/Mk/bsd.port.mk Thu Dec 25 01:10:19 2014 (r375500) @@ -1085,7 +1085,6 @@ CO_ENV+= STAGEDIR=${STAGEDIR} \ WRKDIR=${WRKDIR} \ WRKSRC=${WRKSRC} \ MTREE_FILE=${MTREE_FILE} \ - GNOME_MTREE_FILE=${GNOME_MTREE_FILE} \ TMPPLIST=${TMPPLIST} \ SCRIPTSDIR=${SCRIPTSDIR} \ PLIST_SUB_SED="${PLIST_SUB_SED}" \ Modified: head/misc/Makefile ============================================================================== --- head/misc/Makefile Thu Dec 25 00:51:54 2014 (r375499) +++ head/misc/Makefile Thu Dec 25 01:10:19 2014 (r375500) @@ -147,7 +147,6 @@ SUBDIR += gnome-mime-data SUBDIR += gnome-osd SUBDIR += gnome-user-docs - SUBDIR += gnomehier SUBDIR += gnu-watch SUBDIR += gnuit SUBDIR += gnuls
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412250110.sBP1AK8u064571>