Page MenuHomeFreeBSD
Files F153327567

D1355.diff
No OneTemporary
Actions

D1355.diff
View Options

Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -7329,3 +7329,4 @@
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
Index: head/Mk/Scripts/check-stagedir.sh
===================================================================
--- head/Mk/Scripts/check-stagedir.sh
+++ head/Mk/Scripts/check-stagedir.sh
@@ -173,11 +173,7 @@
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 @@
# 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
Index: head/Mk/bsd.gnome.mk
===================================================================
--- head/Mk/bsd.gnome.mk
+++ head/Mk/bsd.gnome.mk
@@ -69,7 +69,7 @@
# 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 @@
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 @@
.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
Index: head/Mk/bsd.port.mk
===================================================================
--- head/Mk/bsd.port.mk
+++ head/Mk/bsd.port.mk
@@ -1085,7 +1085,6 @@
WRKDIR=${WRKDIR} \
WRKSRC=${WRKSRC} \
MTREE_FILE=${MTREE_FILE} \
- GNOME_MTREE_FILE=${GNOME_MTREE_FILE} \
TMPPLIST=${TMPPLIST} \
SCRIPTSDIR=${SCRIPTSDIR} \
PLIST_SUB_SED="${PLIST_SUB_SED}" \
Index: head/misc/Makefile
===================================================================
--- head/misc/Makefile
+++ head/misc/Makefile
@@ -147,7 +147,6 @@
SUBDIR += gnome-mime-data
SUBDIR += gnome-osd
SUBDIR += gnome-user-docs
- SUBDIR += gnomehier
SUBDIR += gnu-watch
SUBDIR += gnuit
SUBDIR += gnuls
Index: head/misc/gnomehier/Makefile
===================================================================
--- head/misc/gnomehier/Makefile
+++ head/misc/gnomehier/Makefile
@@ -1,49 +0,0 @@
-# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-# $FreeBSD$
-# $MCom: ports/misc/gnomehier/Makefile,v 1.39 2012/12/10 10:58:06 kwm Exp $
-
-PORTNAME= gnomehier
-PORTVERSION= 3.0
-CATEGORIES= misc gnome
-MASTER_SITES= # none
-DISTFILES= # none
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Utility port that creates the GNOME directory tree
-
-NO_BUILD= yes
-PLIST= ${WRKDIR}/pkg-plist
-PKGINSTALL= ${WRKDIR}/pkg-install
-
-GNOME_MTREE= BSD.gnome.dist
-GNOME_MTREE_ARGS=${MTREE_ARGS:S|${MTREE_FILE}|${PREFIX}/etc/mtree/${GNOME_MTREE}|}
-
-pre-install:
- @${CP} -f ${FILESDIR}/dirlist ${WRKDIR}
- @${RM} -f ${PLIST} ${WRKDIR}/${GNOME_MTREE}
- @${TOUCH} -f ${PLIST}
- @${ECHO_CMD} etc/mtree/${GNOME_MTREE} >> ${PLIST}
- @${MKDIR} ${WRKSRC}
- @${CAT} ${FILESDIR}/dirlist | ${SORT} -r | ${SED} -e \
- 's|^|@dirrm |' >> ${PLIST}
- @${ECHO_CMD} "@unexec ${RMDIR} %D/etc/mtree 2>/dev/null || ${TRUE}" >> ${PLIST}
- @for dir in `${CAT} ${WRKDIR}/dirlist`; \
- do \
- ${MKDIR} ${WRKSRC}/$${dir}; \
- done
- @${SED} -e 's|%%MTREE_ARGS%%|${GNOME_MTREE_ARGS}|' \
- < ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
-
-pre-su-install:
- cd ${WRKSRC} && \
- ${MTREE_CMD} -U -d -n -i -c -k "uname, gname, mode" | \
- ${SED} -e 's|uname=[A-Za-z0-9_]*|uname=root|' \
- -e 's|gname=[A-Za-z0-9_]*|gname=wheel|' \
- > ${WRKDIR}/${GNOME_MTREE}
-
-do-install:
- cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}
- ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree
- ${INSTALL_DATA} ${WRKDIR}/${GNOME_MTREE} ${STAGEDIR}${PREFIX}/etc/mtree
-
-.include <bsd.port.mk>
Index: head/misc/gnomehier/files/dirlist
===================================================================
--- head/misc/gnomehier/files/dirlist
+++ head/misc/gnomehier/files/dirlist
@@ -1,128 +0,0 @@
-etc/CORBA
-etc/CORBA/servers
-etc/X11
-etc/X11/serverconfig
-etc/X11/starthere
-etc/X11/sysconfig
-etc/dconf
-etc/dconf/db
-etc/dconf/profile
-etc/gconf
-etc/gconf/gconf.xml.defaults
-etc/gconf/gconf.xml.mandatory
-etc/gconf/gconf.xml.system
-etc/gconf/schemas
-etc/gnome
-etc/gnome-vfs-2.0
-etc/gnome-vfs-2.0/modules
-etc/gnome/config
-etc/mateconf
-etc/mateconf/mateconf.xml.defaults
-etc/mateconf/mateconf.xml.mandatory
-etc/mateconf/mateconf.xml.system
-etc/mateconf/schemas
-etc/sound
-etc/sound/events
-etc/vfs
-etc/vfs/modules
-etc/xdg
-etc/xdg/autostart
-include/gconf
-include/gdkcardimage
-include/gnome-1.0
-lib/GConf
-lib/bonobo
-lib/bonobo/monikers
-lib/bonobo/plugin
-lib/girepository-1.0
-lib/gnome-vfs-2.0
-lib/gnome-vfs-2.0/modules
-lib/mate-vfs-2.0
-lib/mate-vfs-2.0/modules
-lib/matecomponent
-lib/matecomponent-2.0
-lib/matecomponent-2.0/samples
-lib/matecomponent/monikers
-lib/vfs
-lib/vfs/modules
-libdata/bonobo
-libdata/bonobo/servers
-libdata/matecomponent
-libdata/matecomponent/servers
-share/MateConf
-share/MateConf/gsettings
-share/applets
-share/applets/Amusements
-share/applets/Clocks
-share/applets/Monitors
-share/applets/Multimedia
-share/applets/Network
-share/applets/Utility
-share/application-registry
-share/capplets
-share/control-center
-share/control-center-2.0
-share/control-center-2.0/capplets
-share/control-center/Desktop
-share/control-center/Documents
-share/control-center/Peripherals
-share/control-center/Session
-share/control-center/capplets
-share/control-center/keybindings
-share/control-center/keybindings/gtk-modules
-share/doc/libgda
-share/gir-1.0
-share/gnome
-share/gnome-2.0
-share/gnome-2.0/ui
-share/gnome-about
-share/gnome-control-center
-share/gnome-control-center/keybindings
-share/gnome-settings-daemon-3.0
-share/gnome/apps
-share/gnome/apps/Applications
-share/gnome/apps/Audio
-share/gnome/apps/Development
-share/gnome/apps/Games
-share/gnome/apps/Graphics
-share/gnome/apps/Internet
-share/gnome/apps/Multimedia
-share/gnome/apps/Settings
-share/gnome/apps/Settings/Desktop
-share/gnome/apps/Settings/Documents
-share/gnome/apps/Settings/Peripherals
-share/gnome/apps/Settings/Session
-share/gnome/apps/System
-share/gnome/apps/Utilities
-share/gnome/autostart
-share/gnome/help
-share/gnome/help/fdl
-share/gnome/help/fdl/C
-share/gnome/help/gpl
-share/gnome/help/gpl/C
-share/gnome/help/lgpl
-share/gnome/help/lgpl/C
-share/gnome/panel
-share/gnome/ui
-share/gnome/wm-properties
-share/images
-share/mate
-share/mate-2.0
-share/mate-2.0/ui
-share/mate-control-center
-share/mate-control-center/keybindings
-share/mate/help
-share/mc
-share/mc/templates
-share/mime-info
-share/oaf
-share/omf
-share/pixmaps/document-icons
-share/pixmaps/splash
-share/sgml/docbook
-share/sgml/docbook/gnome-customization-0.1
-share/sounds
-share/vala
-share/vala/vapi
-share/vfolders
-share/xmodmap
Index: head/misc/gnomehier/files/pkg-install.in
===================================================================
--- head/misc/gnomehier/files/pkg-install.in
+++ head/misc/gnomehier/files/pkg-install.in
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
- /usr/sbin/mtree %%MTREE_ARGS%% ${PKG_PREFIX}
- exit 0
- ;;
-esac
Index: head/misc/gnomehier/pkg-descr
===================================================================
--- head/misc/gnomehier/pkg-descr
+++ head/misc/gnomehier/pkg-descr
@@ -1,3 +0,0 @@
-This is a utility port that creates the common GNOME directory
-structure. This way, the existence of the directories can be
-ensured before applications attempt to install into them.

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 12:22 PM (20 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31910070
Default Alt Text
D1355.diff (8 KB)

Event Timeline