Don't try and install/use things in /usr/share.

Bump PKGREVISION.

11 files changed, 176 insertions, 3 deletions

diff --git a/graphics/kphotools/Makefile b/graphics/kphotools/Makefile
index 49099c98f61..e33c85788f9 100644
--- a/graphics/kphotools/Makefile
+++ b/graphics/kphotools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/28 14:09:40 markd Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/31 22:30:12 markd Exp $
 #
 
 DISTNAME=	kphotools-0.2.1
+PKGREVISION=	1
 CATEGORIES=	kde graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kphotools/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,6 +17,12 @@ USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
+SUBST_CLASSES+=		kphotools
+SUBST_MESSAGE.kphotools=	"Fixing /usr/share path."
+SUBST_FILES.kphotools=	src/GalleryThrd.cpp src/LogoWid.cpp src/LogoWid.ui src/StyleWid.ui.h
+SUBST_SED.kphotools=	-e 's|@kphotoolsdir@|${KDEDIR}/share/kde/apps/kphotools|'
+SUBST_STAGE.kphotools=	post-patch
+
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/graphics/kphotools/PLIST b/graphics/kphotools/PLIST
index efc63716884..31d08a1bcfb 100644
--- a/graphics/kphotools/PLIST
+++ b/graphics/kphotools/PLIST
@@ -1,11 +1,38 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/28 14:09:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/07/31 22:30:12 markd Exp $
 bin/kphotools
 share/doc/kde/HTML/en/kphotools/common
 share/doc/kde/HTML/en/kphotools/index.cache.bz2
 share/doc/kde/HTML/en/kphotools/index.docbook
 share/kde/applnk/Utilities/kphotools.desktop
 share/kde/apps/kphotools/kphotoolsui.rc
+share/kde/apps/kphotools/logo.png
+share/kde/apps/kphotools/styles/default/config
+share/kde/apps/kphotools/styles/default/general.js
+share/kde/apps/kphotools/styles/default/index.html
+share/kde/apps/kphotools/styles/default/loading.png
+share/kde/apps/kphotools/styles/default/main.css
+share/kde/apps/kphotools/styles/default/main.js
+share/kde/apps/kphotools/styles/default/nofile.png
+share/kde/apps/kphotools/styles/default/preview.png
+share/kde/apps/kphotools/styles/default/show.html
+share/kde/apps/kphotools/styles/default/show.js
+share/kde/apps/kphotools/styles/default/table_corner.png
+share/kde/apps/kphotools/styles/nopreview.png
+share/kde/apps/kphotools/styles/orange/config
+share/kde/apps/kphotools/styles/orange/general.js
+share/kde/apps/kphotools/styles/orange/index.html
+share/kde/apps/kphotools/styles/orange/loading.png
+share/kde/apps/kphotools/styles/orange/main.css
+share/kde/apps/kphotools/styles/orange/main.js
+share/kde/apps/kphotools/styles/orange/nofile.png
+share/kde/apps/kphotools/styles/orange/preview.png
+share/kde/apps/kphotools/styles/orange/show.html
+share/kde/apps/kphotools/styles/orange/show.js
+share/kde/apps/kphotools/styles/orange/table_corner.png
 share/kde/icons/hicolor/16x16/apps/kphotools.png
 share/kde/icons/hicolor/32x32/apps/kphotools.png
+@dirrm share/kde/apps/kphotools/styles/orange
+@dirrm share/kde/apps/kphotools/styles/default
+@dirrm share/kde/apps/kphotools/styles
 @dirrm share/kde/apps/kphotools
 @dirrm share/doc/kde/HTML/en/kphotools
diff --git a/graphics/kphotools/distinfo b/graphics/kphotools/distinfo
index ed102ee58ae..c5ad1a3bef2 100644
--- a/graphics/kphotools/distinfo
+++ b/graphics/kphotools/distinfo
@@ -1,4 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/28 14:09:40 markd Exp $
+$NetBSD: distinfo,v 1.2 2004/07/31 22:30:12 markd Exp $
 
 SHA1 (kphotools-0.2.1.tar.bz2) = 51769be5e6d3533e409b4c24bfcc94fc46c9e169
 Size (kphotools-0.2.1.tar.bz2) = 703387 bytes
+SHA1 (patch-aa) = 3818e56a0fffb7f9439a8e6b2049c46c66b2f96d
+SHA1 (patch-ab) = ef9ff406ff7fded74b82edcc67e7f684dfe8a227
+SHA1 (patch-ac) = 36c45d2e8321e94f3842cd59cceb5c64c26ac661
+SHA1 (patch-ad) = 005991fbd92a6a55f856cbcbb8440acc51a6c7fe
+SHA1 (patch-ae) = dc464e04963138ade2dbfc863342dd475a74746e
+SHA1 (patch-af) = c45640848e877ad8ad455a1e9cfa225eb8d253a8
+SHA1 (patch-ag) = 02767da467413439844e6167ef1a470ffdebfca1
+SHA1 (patch-ah) = e145a89db623351c204f73acc38cb8062f66bdde
diff --git a/graphics/kphotools/patches/patch-aa b/graphics/kphotools/patches/patch-aa
new file mode 100644
index 00000000000..39b83e491b9
--- /dev/null
+++ b/graphics/kphotools/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2004/07/31 22:30:12 markd Exp $
+
+--- src/GalleryThrd.cpp.orig	2004-06-13 03:14:01.000000000 +1200
++++ src/GalleryThrd.cpp
+@@ -305,7 +305,7 @@ void GalleryThrd::doCreateWebsite(uint f
+ 		if(strFiles[i][0] == 'f')//if is file copy it
+ 		{
+ 			strFiles[i].remove(0,1);
+-			system("cp /usr/share/kphotools/styles/"+m_strStyle+"/"+strFiles[i]+"  "+m_strLocation+"/"+strFiles[i]);
++			system("cp @kphotoolsdir@/styles/"+m_strStyle+"/"+strFiles[i]+"  "+m_strLocation+"/"+strFiles[i]);
+ 		}else if(strFiles[i][0] == 'd')//if is dir create it
+ 		{
+ 			strFiles[i].remove(0,1);
+@@ -319,7 +319,7 @@ void GalleryThrd::doCreateWebsite(uint f
+ QStringList GalleryThrd::readConfig()
+ {
+ 	//load configuration for style
+-	QFile* pFile = new QFile("/usr/share/kphotools/styles/"+m_strStyle+"/config");
++	QFile* pFile = new QFile("@kphotoolsdir@/styles/"+m_strStyle+"/config");
+ 	pFile->open(IO_ReadOnly);
+ 	QStringList strList;
+ 	QString strLine = "";
diff --git a/graphics/kphotools/patches/patch-ab b/graphics/kphotools/patches/patch-ab
new file mode 100644
index 00000000000..439fd72a7ea
--- /dev/null
+++ b/graphics/kphotools/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/07/31 22:30:12 markd Exp $
+
+--- src/LogoWid.cpp.orig	2004-08-01 01:08:14.000000000 +1200
++++ src/LogoWid.cpp
+@@ -82,7 +82,7 @@ void LogoWid::languageChange()
+     setCaption( tr2i18n( "LogoWid" ) );
+     m_grpFileLocation->setTitle( tr2i18n( "File && Location" ) );
+     btLogoSelection->setText( tr2i18n( "..." ) );
+-    m_txLogo->setText( tr2i18n( "/usr/share/kphotools/logo.png" ) );
++    m_txLogo->setText( tr2i18n( "@kphotoolsdir@/logo.png" ) );
+     m_butgrpPlace->setTitle( tr2i18n( "Place" ) );
+     m_optTL->setText( tr2i18n( "Top, Left" ) );
+     m_optTR->setText( tr2i18n( "Top, Right" ) );
diff --git a/graphics/kphotools/patches/patch-ac b/graphics/kphotools/patches/patch-ac
new file mode 100644
index 00000000000..68f757a808e
--- /dev/null
+++ b/graphics/kphotools/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/07/31 22:30:12 markd Exp $
+
+--- src/LogoWid.ui.orig	2004-05-30 01:25:18.000000000 +1200
++++ src/LogoWid.ui
+@@ -59,7 +59,7 @@
+                 </rect>
+             </property>
+             <property name="text">
+-                <string>/usr/share/kphotools/logo.png</string>
++                <string>@kphotoolsdir@/logo.png</string>
+             </property>
+         </widget>
+         <widget class="QButtonGroup">
diff --git a/graphics/kphotools/patches/patch-ad b/graphics/kphotools/patches/patch-ad
new file mode 100644
index 00000000000..ef09f56fbc0
--- /dev/null
+++ b/graphics/kphotools/patches/patch-ad
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.1 2004/07/31 22:30:12 markd Exp $
+
+--- src/StyleWid.ui.h.orig	2004-06-01 23:15:58.000000000 +1200
++++ src/StyleWid.ui.h
+@@ -35,7 +35,7 @@ void StyleWid::init()
+ 	//load default picture
+ 	QPixmap pix;
+ 	QImage img;
+-	QString path = "/usr/share/kphotools/styles/nopreview.png";
++	QString path = "@kphotoolsdir@/styles/nopreview.png";
+ 	if(!img.load(path))
+ 	{
+ 	    //return
+@@ -46,7 +46,7 @@ void StyleWid::init()
+ 	m_imgPreview->setPixmap(pix);
+ 	
+ 	//create style list
+-	QDir *dir = new QDir("/usr/share/kphotools/styles");
++	QDir *dir = new QDir("@kphotoolsdir@/styles");
+ 	const QFileInfoList * files = dir->entryInfoList();
+ 	if ( files ) {
+ 		QFileInfoListIterator it( *files );
+@@ -72,7 +72,7 @@ void StyleWid::onSelectStyle( int item )
+ 	QString style = m_cbStyle->text(m_cbStyle->currentItem());
+ 	QPixmap pix;
+ 	QImage img;
+-	QString path = "/usr/share/kphotools/styles/"+style+"/preview.png";
++	QString path = "@kphotoolsdir@/styles/"+style+"/preview.png";
+ 	if(!img.load(path)){}
+ 	pix.convertFromImage(img);
+ 	//show it
diff --git a/graphics/kphotools/patches/patch-ae b/graphics/kphotools/patches/patch-ae
new file mode 100644
index 00000000000..cb787a53db6
--- /dev/null
+++ b/graphics/kphotools/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2004/07/31 22:30:12 markd Exp $
+
+--- src/data/Makefile.in.orig	2004-06-13 03:16:46.000000000 +1200
++++ src/data/Makefile.in
+@@ -258,7 +258,7 @@ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(all_includes)
+ METASOURCES = AUTO
+-stylesdir = /usr/share/kphotools
++stylesdir = $(kde_datadir)/kphotools
+ styles_DATA = logo.png
+ SUBDIRS = styles
+ subdir = src/data
diff --git a/graphics/kphotools/patches/patch-af b/graphics/kphotools/patches/patch-af
new file mode 100644
index 00000000000..6d3c20706a5
--- /dev/null
+++ b/graphics/kphotools/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2004/07/31 22:30:12 markd Exp $
+
+--- src/data/styles/Makefile.in.orig	2004-06-13 03:16:46.000000000 +1200
++++ src/data/styles/Makefile.in
+@@ -259,7 +259,7 @@ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(all_includes)
+ METASOURCES = AUTO
+ SUBDIRS = orange default
+-nopreviewdir = /usr/share/kphotools/styles
++nopreviewdir = $(kde_datadir)/kphotools/styles
+ nopreview_DATA = nopreview.png
+ subdir = src/data/styles
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
diff --git a/graphics/kphotools/patches/patch-ag b/graphics/kphotools/patches/patch-ag
new file mode 100644
index 00000000000..abc34abc04f
--- /dev/null
+++ b/graphics/kphotools/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2004/07/31 22:30:12 markd Exp $
+
+--- src/data/styles/orange/Makefile.in.orig	2004-06-13 03:16:46.000000000 +1200
++++ src/data/styles/orange/Makefile.in
+@@ -258,7 +258,7 @@ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(all_includes)
+ METASOURCES = AUTO
+-orangedir = /usr/share/kphotools/styles/orange
++orangedir = $(kde_datadir)/kphotools/styles/orange
+ orange_DATA = config general.js index.html loading.png main.css main.js nofile.png preview.png show.html show.js table_corner.png
+ subdir = src/data/styles/orange
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
diff --git a/graphics/kphotools/patches/patch-ah b/graphics/kphotools/patches/patch-ah
new file mode 100644
index 00000000000..fd2e8d7a150
--- /dev/null
+++ b/graphics/kphotools/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2004/07/31 22:30:12 markd Exp $
+
+--- src/data/styles/default/Makefile.in.orig	2004-06-13 03:16:46.000000000 +1200
++++ src/data/styles/default/Makefile.in
+@@ -258,7 +258,7 @@ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = $(all_includes)
+ METASOURCES = AUTO
+-defaultdir = /usr/share/kphotools/styles/default
++defaultdir = $(kde_datadir)/kphotools/styles/default
+ default_DATA = config general.js index.html loading.png main.css main.js nofile.png preview.png show.html show.js table_corner.png
+ subdir = src/data/styles/default
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs