head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.6 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.4 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.2 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.2.0.22 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.20 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.18 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.16 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.14 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.12 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.10 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.8 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.6 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.4 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2; locks; strict; comment @# @; 1.3 date 2011.10.02.14.11.57; author wiz; state dead; branches; next 1.2; 1.2 date 2008.11.26.15.48.16; author hira; state Exp; branches; next 1.1; 1.1 date 2008.11.24.11.58.44; author hira; state Exp; branches; next ; desc @@ 1.3 log @Remove packages scheduled to be deleted according to the pkgsrc-2011Q2 release notes. @ text @$NetBSD: patch-ef,v 1.2 2008/11/26 15:48:16 hira Exp $ --- sysui/desktop/share/create_tree.sh.orig 2007-05-11 00:00:24.000000000 +0900 +++ sysui/desktop/share/create_tree.sh 2008-11-27 00:40:42.000000000 +0900 @@@@ -1,46 +1,41 @@@@ umask 022 -if [ "${KDEMAINDIR}" ] +ICON_THEMES="hicolor/??x??" + +if [ "${KDE}" ] then + for i in `cat mimelnklist`; do + ${BSD_INSTALL_DATA} $i ${DESTDIR}${_PREFIX}/share/kde/mimelnk/application/${PREFIX}-$i + done + ICON_THEMES="${ICON_THEMES} locolor" +fi + echo Copying icons .. - for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"` + for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES} -name "*.png"` do - targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname $i` - mkdir -p $targetdir + targetdir=${DESTDIR}${_PREFIX}/share/icons/`dirname $i` + ${BSD_INSTALL_DATA_DIR} $targetdir destfile=$targetdir/${ICON_PREFIX:-}${ICON_PREFIX:+-}`basename $i` - cp ${ICON_SOURCE_DIR}/$i $destfile - chmod 0644 $destfile - done - - mkdir -p ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application - for i in `cat mimelnklist`; do - cp $i ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/${PREFIX}-$i + ${BSD_INSTALL_DATA} ${ICON_SOURCE_DIR}/$i $destfile done - chmod 0644 ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/* -fi -if [ "${GNOMEDIR}" ] +if [ "${GNOME}" ] then echo Copying GNOME icons .. for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? -name "*.png"` do - targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname $i` - mkdir -p $targetdir + targetdir=${DESTDIR}${_PREFIX}/share/icons/gnome/`dirname $i` destfile=$targetdir/${ICON_PREFIX:-}${ICON_PREFIX:+-}`basename $i` - cp ${ICON_SOURCE_DIR}/hicolor/$i $destfile - chmod 0644 $destfile + ${BSD_INSTALL_DATA} ${ICON_SOURCE_DIR}/hicolor/$i $destfile done +fi - mkdir -p ${DESTDIR}/${GNOMEDIR}/share/mime-info - cp openoffice.mime ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.mime - cp openoffice.keys ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.keys - chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.* - - mkdir -p ${DESTDIR}/${GNOMEDIR}/share/application-registry - cp openoffice.applications ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.applications - chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.* + ${BSD_INSTALL_DATA} openoffice.mime ${DESTDIR}${_PREFIX}/share/mime-info/${PREFIX}.mime + ${BSD_INSTALL_DATA} openoffice.keys ${DESTDIR}${_PREFIX}/share/mime-info/${PREFIX}.keys + + ${BSD_INSTALL_DATA} openoffice.applications ${DESTDIR}${_PREFIX}/share/application-registry/${PREFIX}.applications - if [ "${GNOME_MIME_THEME}" ] + if [ ] then echo "Creating legacy mimetype symlinks for GNOME .." # add symlinks so that nautilus can identify the mime-icons @@@@ -88,29 +83,22 @@@@ ln -sf $link_target_dir${ICON_PREFIX:-}${ICON_PREFIX:+-}extension.png ${link_dir}/gnome-mime-application-vnd.openofficeorg.extension.png done fi -fi - -mkdir -p ${DESTDIR}/usr/bin # reference symbolic link in /etc for relocatable packages -office_root=/etc/${PREFIX} +office_root=${DESTDIR}${OO_PREFIX} if [ ! -e "${DESTDIR}/$office_root" -a ! -h "${DESTDIR}/$office_root" ]; then office_root=/opt/${PREFIX} fi -ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice -ln -sf ${office_root}/program/unopkg ${DESTDIR}/usr/bin/unopkg +#ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice +#ln -sf ${office_root}/program/unopkg ${DESTDIR}/usr/bin/unopkg + +${BSD_INSTALL_SCRIPT} openoffice.sh ${DESTDIR}${_PREFIX}/bin/${PREFIX} +${BSD_INSTALL_SCRIPT} printeradmin.sh ${DESTDIR}${_PREFIX}/bin/${PREFIX}-printeradmin -cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX} -cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin -chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin - -mkdir -p ${DESTDIR}/usr/share/mime/packages -cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/ -chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml +${BSD_INSTALL_DATA} openoffice.org.xml ${DESTDIR}${_PREFIX}/share/mime/packages/ -mkdir -p ${DESTDIR}/usr/share/applications for i in `cat launcherlist`; do - ln -sf ${office_root}/share/xdg/$i ${DESTDIR}/usr/share/applications/${PREFIX}-$i + ln -sf ${office_root}/share/xdg/$i ${DESTDIR}${_PREFIX}/share/applications/${PREFIX}-$i done @ 1.2 log @ - Fix installation path of kde mimelnk files. - Don't install locolor icons without kde option. No PKGREVISION bump because the icons are not used without kde. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @ - Install hicolor and locolor icons. - Install gnome icons (with gnome option only). - Install MIME info files. - Fix name of .dekstop files. - Use startup scripts in OOo (don't generate these in Makefile). Bump PKGREVISION. @ text @d3 3 a5 3 --- sysui/desktop/share/create_tree.sh.orig 2008-11-24 16:07:39.000000000 +0900 +++ sysui/desktop/share/create_tree.sh 2008-11-24 16:14:06.000000000 +0900 @@@@ -1,46 +1,38 @@@@ d9 10 a18 1 -then d20 2 a21 1 for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"` d30 1 a30 2 + ${BSD_INSTALL_DATA} ${ICON_SOURCE_DIR}/$i $destfile done d33 1 a33 4 + +if [ "${KDE}" ] +then for i in `cat mimelnklist`; do d35 1 a35 1 + ${BSD_INSTALL_DATA} $i ${DESTDIR}${_PREFIX}/share/mimelnk/application/${PREFIX}-$i d38 1 a38 1 fi d66 2 a69 2 + ${BSD_INSTALL_DATA} openoffice.applications ${DESTDIR}${_PREFIX}/share/application-registry/${PREFIX}.applications + d74 1 a74 1 @@@@ -88,29 +80,22 @@@@ @