pkg/26841: wm/enlightenment doesn't install documentation (patch included)

[Peter.Bex%student.kun.nl@localhost]

>Number:         26841
>Category:       pkg
>Synopsis:       wm/enlightenment doesn't install documentation (patch included)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Sep 03 17:24:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 2.0_BETA
>Organization:
        
>Environment:
        
        
System: NetBSD frohike.nvie.com 2.0_BETA NetBSD 2.0_BETA (FROHIKE) #0: Tue Aug 
24 22:02:00 CEST 2004 
sjamaan%frohike.nvie.com@localhost:/usr/src/sys/arch/i386/compile/FROHIKE i386
Architecture: i386
Machine: i386
>Description:
        wm/enlightenment doesn't install documentation.
        Since the previous release, enlightenment's documentation is a
        separate tarball.  There is one small problem though:  without the
        documentation, the help browser (edox) does not work correctly
        because there are no images for prev/next and close buttons.

        This causes problems with among others wip/epplets, where every
        epplet has its own help files.  These can't be viewed correctly,
        and the help browser has to be forcibly closed.

        Patch and additional files included here to update the pkg.

        Another option would be to create a new enlightenment-docs pkg.
        IMHO it is better to have wm/enlightenment install the
        documentation, since Enlightenment's help viewer is a bit broken
        without the necessary documentation files.
>How-To-Repeat:
        Try to open the help.  Won't work.  Install wip/epplets, run any
        epplet which works and click the help button.
>Fix:

NEW FILES:
----------

patches/patch-ad:
===================================================================
$NetBSD$

--- ../enlightenment-docs-0.16.7/E-docs/MAIN.ja.orig    2004-03-11 
20:23:40.000000000 +0100
+++ ../enlightenment-docs-0.16.7/E-docs/MAIN.ja
@@ -764,7 +764,7 @@ _¥Ç¥¹¥¯¥È¥Ã¥×(desktops) ¤Î¥É¥­¥å¥á¥ó¥È¤Ë
 <page columns=1 padding=16 name=iconbox3 background=Edoc_bg.png 
linkcolor=#88dddd>
 <font 
face="-misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0,-misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0"
 color=#ffffff>
 <p>
-¥¢¥¤¥³¥ó¥Ü¥Ã¥¯¥¹¤Ë¤¢¤ë¥¢¥¤¥³¥ó¤Ë»È¤ï¤ì¤ë¥¤¥á¡¼¥¸¤ò¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¤¤¤Ê¤é¡¢ÀßÄê¤ÎÎ㤬¤¹¤Ç¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Æȼ«¤ÎÀßÄê¤ò¤¹¤ë¤Ë¤Ï¡¢
 Enlightenment ¤Î¥·¥¹¥Æ¥àÀßÄê¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë icondefs.cfg ¥Õ¥¡¥¤¥ë 
(/usr/local/enlightenment/config/icondefs.cfg¤«/usr/share/enlightenment/config/icondefs.cfg
 ¤¢¤ë¤¤¤Ï /usr/X11R6/share/enlightenment/config/icondefs.cfg) ¤ò 
~/.enlightenment 
¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥³¥Ô¡¼¤·¤ÆÊÔ½¸¤·¤Þ¤¹¡£¤½¤ì¤¾¤ì¤Î¹Ô¤Ë¤Ï4¤Ä¤Î¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤¹¡£ºÇ½é¤Î¥Õ¥£¡¼¥ë¥É¤Ï»ÈÍѤµ¤ì¤ë¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤Ç¤¹¡£¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤ÎÀäÂХѥ¹¤Ç¤Ê¤±¤ì¤Ð¡¢Ä̾ï¤Î¸¡º÷¥Ñ¥¹¤Ç¸¡º÷¤µ¤ì¤Þ¤¹¡£¸¡º÷¥Ñ¥¹¤Î½ç½ø¤Ï
 ~/.enlightennent¡¢THEME_DIR/¡¢ ENLIGHTENMENT_ROOT/config ¤Ç¤¹¡£
+¥¢¥¤¥³¥ó¥Ü¥Ã¥¯¥¹¤Ë¤¢¤ë¥¢¥¤¥³¥ó¤Ë»È¤ï¤ì¤ë¥¤¥á¡¼¥¸¤ò¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¤¤¤Ê¤é¡¢ÀßÄê¤ÎÎ㤬¤¹¤Ç¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Æȼ«¤ÎÀßÄê¤ò¤¹¤ë¤Ë¤Ï¡¢
 Enlightenment ¤Î¥·¥¹¥Æ¥àÀßÄê¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë icondefs.cfg ¥Õ¥¡¥¤¥ë 
(@PREFIX@/share/enlightenment/config/icondefs.cfg) ¤ò ~/.enlightenment 
¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥³¥Ô¡¼¤·¤ÆÊÔ½¸¤·¤Þ¤¹¡£¤½¤ì¤¾¤ì¤Î¹Ô¤Ë¤Ï4¤Ä¤Î¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤¹¡£ºÇ½é¤Î¥Õ¥£¡¼¥ë¥É¤Ï»ÈÍѤµ¤ì¤ë¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤Ç¤¹¡£¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤ÎÀäÂХѥ¹¤Ç¤Ê¤±¤ì¤Ð¡¢Ä̾ï¤Î¸¡º÷¥Ñ¥¹¤Ç¸¡º÷¤µ¤ì¤Þ¤¹¡£¸¡º÷¥Ñ¥¹¤Î½ç½ø¤Ï
 ~/.enlightennent¡¢THEME_DIR/¡¢ ENLIGHTENMENT_ROOT/config ¤Ç¤¹¡£
 <p>
 
¼¡¤Î¥Õ¥£¡¼¥ë¥É¤Ï¥¦¥£¥ó¥É¥¦¤Î¥¿¥¤¥È¥ë¤Ë¥Þ¥Ã¥Á¤µ¤»¤ë¥·¥§¥ë¤ÎÀµµ¬É½¸½¤Ç¤¹¡£¤³¤Î¥Õ¥£¡¼¥ë¥É¤Ë²¿¤â¤Ê¤±¤ì¤Ð¡¢¤«¤ï¤ê¤Ë
 NULL ¤¬»È¤ï¤ì¤Þ¤¹¡£¤Ä¤Þ¤êÍ­¸ú¤ÊÀµµ¬É½¸½¤Ï "*" 
¤À¤±¤Ë¤Ê¤ê¤Þ¤¹¡£3ÈÖÌܤΥե£¡¼¥ë¥É¤Ï¥¦¥£¥ó¥É¥¦¤Î NAME ¥×¥í¥Ñ¥Æ¥£¤Ç4ÈÖÌÜ¤Ï CLASS 
¤Ç¤¹¡£¸¡º÷¤ÎÍ¥Àè½ç°Ì¤ÏºÇ¸å¤«¤éºÇ½é¤Ç¤¹¤Î¤Ç¡¢¥¦¥£¥ó¥É¥¦¤Î¥¿¥¤¥È¥ë¡¢Ì¾Á°¡¢¥¯¥é¥¹¤Ë¥Þ¥Ã¥Á¤¹¤ë¡¢¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Î¥¨¥ó¥È¥ê¤¬¤Ï¤¸¤á¤Î¹Ô¤ÇÄêµÁ¤µ¤ì¤¿¥¢¥¤¥³¥ó¥¤¥á¡¼¥¸¤Ë»È¤ï¤ì¤Þ¤¹¡£
===================================================================

patches/patch-ae:
===================================================================
$NetBSD$

--- ../enlightenment-docs-0.16.7/E-docs/MAIN.orig       2004-07-12 
17:11:15.000000000 +0200
+++ ../enlightenment-docs-0.16.7/E-docs/MAIN
@@ -971,8 +971,8 @@ Iconbox location.
 If you want to customize the images used for the icons in your iconbox, there 
 is already an example configuration supplied. To make your own configuration
 copy the icondefs.cfg file installed in your Enlightenment system config 
-directory (/usr/local/enlightenment/config/icondefs.cfg or 
-/usr/share/enlightenment/config/icondefs.cfg) to your ~/.enlightenment 
+directory (@PREFIX@/share/enlightenment/config/icondefs.cfg) to your
+~/.enlightenment 
 directory and then edit it. On each line you will find 4 fields. The first
 field is the image file to be used. The image is searched for in the usual 
 search path if it is not an absolute path to the image file. The search path
===================================================================

patches/patch-af:
===================================================================
$NetBSD$

--- ../enlightenment-docs-0.16.7/E-docs/MAIN.pl.orig    2004-03-11 
20:23:44.000000000 +0100
+++ ../enlightenment-docs-0.16.7/E-docs/MAIN.pl
@@ -961,8 +961,8 @@ twojego pude³ka na ikony. 
 Je¶li chcesz dostosowaæ obrazki u¿ywane jako ikony w Twoim pude³ku, dostêpny
 jest przyk³adowy plik konfiguracyjny. Swoj± w³asn± konfiguracjê mo¿esz
 stworzyc przez skopiowanie pliku icondefs.cfg z katalogu systemowego 
Enlightenment
-(/usr/local/enlightenment/config/icondefs.cfg lub 
-/usr/share/enlightenment/config/icondefs.cfg) do swojego katalogu 
~/.enlightenment
+(@PREFIX@/share/enlightenment/config/icondefs.cfg) do swojego katalogu
+~/.enlightenment
 i jego edycjê. W ka¿dej lini znajduj± siê 4 pola. Pierwsze z nich to nazwa 
pliku 
 graficznego, który ma byæ u¿yty. Je¶li podana ¶cie¿kla nie jest absolutna, 
u¿ywane s±
 nastêpuj±ce katalogi - w kolejno¶ci: ~/.enlightenment, THEME_DIR/, 
===================================================================




PATCHES:
--------

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/enlightenment/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile    26 Aug 2004 20:22:18 -0000      1.22
+++ Makefile    3 Sep 2004 17:08:06 -0000
@@ -4,11 +4,18 @@
 DISTNAME=              enlightenment-0.16.7.1
 CATEGORIES=            x11 gnome wm
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
+DISTFILES=             ${E_FILES} ${EDOC_FILES}
 
 MAINTAINER=            tech-pkg%NetBSD.org@localhost
 HOMEPAGE=              http://www.enlightenment.org/
 COMMENT=               Highly themeable and configurable window manager
 
+E_FILES=               ${DISTNAME}${EXTRACT_SUFX}
+EDOC_NAME=             enlightenment-docs-0.16.7
+EDOC_FILES=            ${EDOC_NAME}.tar.gz
+EDOC_DIR=              ${WRKDIR}/${EDOC_NAME}
+EDOC_INSTDIR=          ${PREFIX}/share/enlightenment/E-docs
+
 USE_BUILDLINK3=                YES
 USE_X11=               YES
 USE_PERL5=             YES
@@ -32,6 +39,9 @@
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     scripts/e_gen_menu
+SUBST_FILES.paths+=    ../${EDOC_NAME}/E-docs/MAIN
+SUBST_FILES.paths+=    ../${EDOC_NAME}/E-docs/MAIN.jp
+SUBST_FILES.paths+=    ../${EDOC_NAME}/E-docs/MAIN.pl
 
 SUBST_SED.paths=       -e 's,@LOCALBASE@,${LOCALBASE},g'
 SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX},g'
@@ -46,6 +56,12 @@
        ${FIND} ${PREFIX}/share/enlightenment/themes -type f -print | \
        ${XARGS} ${CHMOD} ${SHAREMODE}
 
+       ${INSTALL_DATA_DIR} ${EDOC_INSTDIR}
+       cd ${EDOC_DIR}/E-docs && for FILE in *; do \
+               ${ECHO} installing ${EDOC_INSTDIR}/$${FILE}; \
+               ${INSTALL_DATA} $${FILE} ${EDOC_INSTDIR}/$${FILE}; \
+       done
+
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/enlightenment/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- PLIST       26 Aug 2004 20:22:18 -0000      1.6
+++ PLIST       3 Sep 2004 17:08:07 -0000
@@ -6,6 +6,69 @@
 bin/starte16
 etc/X11/dm/Sessions/enlightenment.desktop
 man/man1/enlightenment.1
+share/enlightenment/E-docs/E_app_menu.png
+share/enlightenment/E-docs/E_app_rightmouse_menu.png
+share/enlightenment/E-docs/E_area_settings.png
+share/enlightenment/E-docs/E_audio_settings.png
+share/enlightenment/E-docs/E_autoraise_settings.png
+share/enlightenment/E-docs/E_backgrounds_menu.png
+share/enlightenment/E-docs/E_backgrounds_menu_view.png
+share/enlightenment/E-docs/E_backgrounds_settings.pl.png
+share/enlightenment/E-docs/E_backgrounds_settings.png
+share/enlightenment/E-docs/E_border_selector.png
+share/enlightenment/E-docs/E_deskarray.png
+share/enlightenment/E-docs/E_deskimg.png
+share/enlightenment/E-docs/E_deskstack.png
+share/enlightenment/E-docs/E_dragbar.png
+share/enlightenment/E-docs/E_dragging_desktops.png
+share/enlightenment/E-docs/E_enlightenment_menu.png
+share/enlightenment/E-docs/E_focus_settings.png
+share/enlightenment/E-docs/E_group_settings.png
+share/enlightenment/E-docs/E_groups_menu.png
+share/enlightenment/E-docs/E_iconbox.png
+share/enlightenment/E-docs/E_iconbox_menu.png
+share/enlightenment/E-docs/E_iconbox_settings.png
+share/enlightenment/E-docs/E_kde_settings.png
+share/enlightenment/E-docs/E_keyboard.png
+share/enlightenment/E-docs/E_logo-old.png
+share/enlightenment/E-docs/E_logo.png
+share/enlightenment/E-docs/E_maint_menu.png
+share/enlightenment/E-docs/E_mouse.png
+share/enlightenment/E-docs/E_mousewheel.png
+share/enlightenment/E-docs/E_move_resize_settings.png
+share/enlightenment/E-docs/E_pager.png
+share/enlightenment/E-docs/E_pager_settings.png
+share/enlightenment/E-docs/E_pager_settings_menu.png
+share/enlightenment/E-docs/E_placement_settings.png
+share/enlightenment/E-docs/E_remember_settings.png
+share/enlightenment/E-docs/E_screen_start.png
+share/enlightenment/E-docs/E_settings_menu.png
+share/enlightenment/E-docs/E_special_fx_settings.png
+share/enlightenment/E-docs/E_tooltip_settings.png
+share/enlightenment/E-docs/E_tooltips.png
+share/enlightenment/E-docs/E_virtual_desk_settings.png
+share/enlightenment/E-docs/E_website.png
+share/enlightenment/E-docs/E_window.png
+share/enlightenment/E-docs/E_window_diagram.pl.png
+share/enlightenment/E-docs/E_window_diagram.png
+share/enlightenment/E-docs/Edoc_bg.png
+share/enlightenment/E-docs/FIRST_0.16
+share/enlightenment/E-docs/MAIN
+share/enlightenment/E-docs/MAIN.ja
+share/enlightenment/E-docs/MAIN.pl
+share/enlightenment/E-docs/Makefile
+share/enlightenment/E-docs/Makefile.am
+share/enlightenment/E-docs/Makefile.in
+share/enlightenment/E-docs/Verah___.ttf
+share/enlightenment/E-docs/aircut3.ttf
+share/enlightenment/E-docs/exit1.xpm
+share/enlightenment/E-docs/exit2.xpm
+share/enlightenment/E-docs/next1.xpm
+share/enlightenment/E-docs/next2.xpm
+share/enlightenment/E-docs/prev1.xpm
+share/enlightenment/E-docs/prev2.xpm
+share/enlightenment/E-docs/rothwell.ttf
+share/enlightenment/E-docs/title.xpm
 share/enlightenment/config/actionclasses.cfg
 share/enlightenment/config/actionclasses.cfg.ja
 share/enlightenment/config/actionclasses.cfg.ko
@@ -511,6 +574,7 @@
 @dirrm share/enlightenment/misc
 @dirrm share/enlightenment/config/pix
 @dirrm share/enlightenment/config
+@dirrm share/enlightenment/E-docs
 @dirrm share/enlightenment
 @dirrm etc/X11/dm/Sessions
 @dirrm etc/X11/dm
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/enlightenment/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo    26 Aug 2004 20:22:18 -0000      1.7
+++ distinfo    3 Sep 2004 17:08:07 -0000
@@ -2,6 +2,11 @@
 
 SHA1 (enlightenment-0.16.7.1.tar.gz) = df5fe1527ac1aa5273b8a39aafec06a67673d9ee
 Size (enlightenment-0.16.7.1.tar.gz) = 1791137 bytes
-SHA1 (patch-aa) = 21772995ff370c81073b4c0dfd7f3182bab93768
+SHA1 (enlightenment-docs-0.16.7.tar.gz) = 
a585c5d34e25a7dc803b95b970372d01ceba94b6
+Size (enlightenment-docs-0.16.7.tar.gz) = 2177700 bytes
+SHA1 (patch-aa) = 20b268139eaf530d711bcf68c855c94aadcd90b9
 SHA1 (patch-ab) = ccc73e4dfa8f0624f285a66e9246355642120cf4
 SHA1 (patch-ac) = a7dc0765aefe409643d765d97236098f8a8ca88b
+SHA1 (patch-ad) = 4c458e2a659e05d3e16e2099fade23215501d086
+SHA1 (patch-ae) = 967057b36582091eb2b1f4a43e217dd0d0e80a6a
+SHA1 (patch-af) = 6f1a2689f90eff4f2a19860fcab118fd5d3811e2
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/enlightenment/patches/patch-aa,v
retrieving revision 1.5
diff -u -r1.5 patch-aa
--- patches/patch-aa    26 Aug 2004 20:22:18 -0000      1.5
+++ patches/patch-aa    3 Sep 2004 17:08:07 -0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2004/08/26 20:22:18 recht Exp $
+$NetBSD$
 
---- dox/file.c.orig    2004-07-01 20:51:46.000000000 +0200
+--- dox/file.c.orig    2004-07-25 11:46:11.000000000 +0200
 +++ dox/file.c
 @@ -26,6 +26,11 @@
  # include <wctype.h>

>Release-Note:
>Audit-Trail:
>Unformatted: