6 files changed, 45 insertions, 27 deletions

diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 489cd16c96e1..c9bea764abf4 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qnapi
 PORTVERSION=	0.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	polish multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -16,8 +16,13 @@ COMMENT=	Unoffical napiprojekt.pl qt4 client
 
 RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
 
+LICENSE=	GPLv2
+
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui network qmake_build moc_build uic_build rcc_build
+USE_KDE4=	kdehier
+QMAKE_ARGS=	PREFIX=${PREFIX} KDE4_PREFIX=${KDE4_PREFIX}
+MAKE_JOBS_SAFE=	yes
 INSTALLS_ICONS=	yes
 
 MAN1=		qnapi.1
@@ -26,11 +31,13 @@ PORTDOCS=	ChangeLog changelog.gz README README.pl LICENSE \
 		LICENSE.pl COPYRIGHT
 
 post-patch:
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' qnapi.pro \
+	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \
 		doc/qnapi.desktop doc/qnapi-download.desktop
+	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|@LOCALBASE@|${LOCALBASE}|g' \
+		src/napi.h
 
 pre-build:
-	@cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC}
+	@cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/polish/qnapi/distinfo b/polish/qnapi/distinfo
index 1cbec7bab929..79ca04616ea0 100644
--- a/polish/qnapi/distinfo
+++ b/polish/qnapi/distinfo
@@ -1,3 +1,2 @@
-MD5 (qnapi-0.1.5.tar.gz) = 503a34b4605507740bca5fbf6a20fbf8
 SHA256 (qnapi-0.1.5.tar.gz) = 88ef9e4c8a2e830b0b9b231888e0012d10ac5ab3b8df7a18d09f42ee7de7fa5d
 SIZE (qnapi-0.1.5.tar.gz) = 172405
diff --git a/polish/qnapi/files/patch-doc-qnapi.desktop b/polish/qnapi/files/patch-doc-qnapi.desktop
index 4e0037176b1b..c38cc54c59f4 100644
--- a/polish/qnapi/files/patch-doc-qnapi.desktop
+++ b/polish/qnapi/files/patch-doc-qnapi.desktop
@@ -7,5 +7,5 @@
 -Icon=/usr/share/icons/qnapi-48.png
 +Icon=@PREFIX@/share/icons/qnapi.png
  Type=Application
- Categories=Application;Multimedia;AudioVideo;Utility;Qt;
+ Categories=AudioVideo;
  Comment=Program do pobierania napisów do filmów
diff --git a/polish/qnapi/files/patch-qnapi.pro b/polish/qnapi/files/patch-qnapi.pro
index e7df63966f89..dc0c17a2bb3a 100644
--- a/polish/qnapi/files/patch-qnapi.pro
+++ b/polish/qnapi/files/patch-qnapi.pro
@@ -1,15 +1,15 @@
---- qnapi.pro.orig	Tue May 20 18:50:01 2008
-+++ qnapi.pro	Mon Jun  2 15:00:17 2008
+--- qnapi.pro.orig	2008-05-20 18:50:01.000000000 +0200
++++ qnapi.pro	2010-11-27 13:38:04.000000000 +0100
 @@ -77,7 +77,7 @@
  #QMAKE_BUNDLE_DATA += 7ZIP_BINARY
  }
  unix {
 - INSTALL_PREFIX =  /usr
-+ INSTALL_PREFIX =  @PREFIX@
++ INSTALL_PREFIX =  $$PREFIX
   target.path =  $${INSTALL_PREFIX}/bin
   doc.path =  $${INSTALL_PREFIX}/share/doc/$${TARGET}
   doc.files =  doc/ChangeLog \
-@@ -89,29 +89,27 @@
+@@ -89,27 +89,24 @@
    doc/COPYRIGHT \
    doc/qnapi-download.desktop \
    doc/qnapi-download.schemas
@@ -22,27 +22,23 @@
 - desktop.path =  /usr/share/applications
 + desktop.path =  $${INSTALL_PREFIX}/share/applications
   desktop.files =  doc/$${TARGET}.desktop
-- dolphin_integration.path =  /usr/share/apps/dolphin/servicemenus
-+ dolphin_integration.path =  $${INSTALL_PREFIX}/share/apps/dolphin/servicemenus
+  dolphin_integration.path =  /usr/share/apps/dolphin/servicemenus
   dolphin_integration.files =  doc/$${TARGET}-download.desktop
-- d3lphin_integration.path =  /usr/share/apps/d3lphin/servicemenus
-+ d3lphin_integration.path =  $${INSTALL_PREFIX}/share/apps/d3lphin/servicemenus
+  d3lphin_integration.path =  /usr/share/apps/d3lphin/servicemenus
   d3lphin_integration.files =  doc/$${TARGET}-download.desktop
 - konqueror_integration.path =  /usr/share/apps/konqueror/servicemenus
 + konqueror_integration.path =  $${INSTALL_PREFIX}/share/apps/konqueror/servicemenus
   konqueror_integration.files =  doc/$${TARGET}-download.desktop
-  kde4_integration.path =  /usr/lib/kde4/share/kde4/services/ServiceMenus
+- kde4_integration.path =  /usr/lib/kde4/share/kde4/services/ServiceMenus
++ kde4_integration.path =  $$KDE4_PREFIX/share/kde4/services/ServiceMenus
   kde4_integration.files =  doc/$${TARGET}-download.desktop
   INSTALLS =  target \
 -  doc \
    man \
    icons \
    desktop \
-   dolphin_integration \
-   d3lphin_integration \
--  konqueror_integration \
--  kde4_integration
-+  konqueror_integration
+-  dolphin_integration \
+-  d3lphin_integration \
+   konqueror_integration \
+   kde4_integration
  }
- win32 {
-  RC_FILE =  win32/qnapi.rc
diff --git a/polish/qnapi/files/patch-src-napi.h b/polish/qnapi/files/patch-src-napi.h
new file mode 100644
index 000000000000..839944868499
--- /dev/null
+++ b/polish/qnapi/files/patch-src-napi.h
@@ -0,0 +1,20 @@
+--- src/napi.h.orig	2010-11-27 12:39:09.000000000 +0100
++++ src/napi.h	2010-11-27 12:40:06.000000000 +0100
+@@ -67,7 +67,7 @@
+ 
+ bool napiMatchSubtitles(const QString & md5sum, const QString & zip_file, const QString & movie_file,
+ 						bool noBackup = false, const QString & tmp_path = "/tmp",
+-						const QString & p7zip_path = "/usr/bin/7z");
++						const QString & p7zip_path = "@LOCALBASE@/bin/7z");
+ 
+ bool napiCheckUser(const QString & nick, const QString & pass);
+ 
+@@ -76,7 +76,7 @@
+ 										const QString & pass, bool correct = false,
+ 										const QString & comment = "",
+ 										const QString & tmp_path = "/tmp",
+-										const QString & p7zip_path = "/usr/bin/7z");
++										const QString & p7zip_path = "@LOCALBASE@/bin/7z");
+ 
+ napiReportResult napiReportBad(const QString & movie_file, const QString & language,
+ 								const QString & nick, const QString & pass, const QString & comment,
diff --git a/polish/qnapi/pkg-plist b/polish/qnapi/pkg-plist
index c1c1f59d06bd..54016f01c188 100644
--- a/polish/qnapi/pkg-plist
+++ b/polish/qnapi/pkg-plist
@@ -4,15 +4,11 @@ share/icons/qnapi-48.png
 share/icons/qnapi-128.png
 share/icons/qnapi-512.png
 share/applications/qnapi.desktop
-share/apps/dolphin/servicemenus/qnapi-download.desktop
-share/apps/d3lphin/servicemenus/qnapi-download.desktop
 share/apps/konqueror/servicemenus/qnapi-download.desktop
-@dirrmtry share/apps/d3lphin/servicemenus
-@dirrmtry share/apps/d3lphin
 @dirrmtry share/apps/konqueror/servicemenus
 @dirrmtry share/apps/konqueror
-@dirrmtry share/apps/dolphin/servicemenus
-@dirrmtry share/apps/dolphin
 @dirrmtry share/apps
 @dirrmtry share/applications
 @dirrmtry share/icons
+@cwd %%KDE4_PREFIX%%
+share/kde4/services/ServiceMenus/qnapi-download.desktop