From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 27 16:40:11 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6315A106564A for ; Sat, 27 Nov 2010 16:40:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1E1DC8FC1C for ; Sat, 27 Nov 2010 16:40:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oARGeAiD086709 for ; Sat, 27 Nov 2010 16:40:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oARGeA93086708; Sat, 27 Nov 2010 16:40:10 GMT (envelope-from gnats) Resent-Date: Sat, 27 Nov 2010 16:40:10 GMT Resent-Message-Id: <201011271640.oARGeA93086708@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pawel Pekala" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69F6E106566C for ; Sat, 27 Nov 2010 16:36:51 +0000 (UTC) (envelope-from c0rn@o2.pl) Received: from moh2-ve3.go2.pl (moh2-ve3.go2.pl [193.17.41.208]) by mx1.freebsd.org (Postfix) with ESMTP id CB2728FC14 for ; Sat, 27 Nov 2010 16:36:50 +0000 (UTC) Received: from moh2-ve3.go2.pl (unknown [10.0.0.208]) by moh2-ve3.go2.pl (Postfix) with ESMTP id EFF5F37016F for ; Sat, 27 Nov 2010 17:36:47 +0100 (CET) Received: from unknown (unknown [10.0.0.142]) by moh2-ve3.go2.pl (Postfix) with SMTP for ; Sat, 27 Nov 2010 17:36:47 +0100 (CET) Received: from adbc154.neoplus.adsl.tpnet.pl [79.184.2.154] by poczta.o2.pl with ESMTP id hEnXtf; Sat, 27 Nov 2010 17:36:47 +0100 Message-Id: <1290875913.17489@caprica.slowicza.org> Date: Sat, 27 Nov 2010 17:38:33 +0100 From: "Pawel Pekala" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/152619: [maintainer] polish/qnapi port cleanup X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Nov 2010 16:40:11 -0000 >Number: 152619 >Category: ports >Synopsis: [maintainer] polish/qnapi port cleanup >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Nov 27 16:40:10 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Pawel Pekala >Release: FreeBSD 8.1-RELEASE i386 >Organization: >Environment: System: FreeBSD 8.1-RELEASE #2: Sat Aug 21 18:46:54 CEST 2010 corn@caprica.slowicza.org:/usr/obj/usr/src/sys/GENERIC >Description: - add LICENSE info - mark MAKE_JOBS_SAFE - install KDE4 integration file - fix prefixes in desktop entries files - add patch so that location of 7z binary is not badly hardcoded - remove some non essential files from install >How-To-Repeat: >Fix: --- qnapi-0.1.5_3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/polish/qnapi/Makefile /home/corn/devel/qnapi/Makefile --- /usr/ports/polish/qnapi/Makefile 2010-03-28 08:42:16.000000000 +0200 +++ /home/corn/devel/qnapi/Makefile 2010-11-27 13:41:15.000000000 +0100 @@ -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,11 @@ 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 +MAKE_JOBS_SAFE= yes INSTALLS_ICONS= yes MAN1= qnapi.1 @@ -26,8 +29,9 @@ LICENSE.pl COPYRIGHT post-patch: - @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' qnapi.pro \ - doc/qnapi.desktop doc/qnapi-download.desktop + @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' qnapi.pro + @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|@LOCALBASE@|${LOCALBASE}|g' \ + doc/qnapi.desktop doc/qnapi-download.desktop src/napi.h pre-build: @cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC} diff -ruN --exclude=CVS /usr/ports/polish/qnapi/distinfo /home/corn/devel/qnapi/distinfo --- /usr/ports/polish/qnapi/distinfo 2008-07-05 02:56:04.000000000 +0200 +++ /home/corn/devel/qnapi/distinfo 2010-11-27 12:42:26.000000000 +0100 @@ -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 -ruN --exclude=CVS /usr/ports/polish/qnapi/files/patch-doc-qnapi.desktop /home/corn/devel/qnapi/files/patch-doc-qnapi.desktop --- /usr/ports/polish/qnapi/files/patch-doc-qnapi.desktop 2008-07-05 02:56:04.000000000 +0200 +++ /home/corn/devel/qnapi/files/patch-doc-qnapi.desktop 2010-11-27 12:29:29.000000000 +0100 @@ -1,11 +1,11 @@ ---- doc/qnapi.desktop.orig Tue Feb 26 20:18:29 2008 -+++ doc/qnapi.desktop Thu Apr 10 20:07:03 2008 +--- doc/qnapi.desktop.orig 2008-05-22 11:50:43.000000000 +0200 ++++ doc/qnapi.desktop 2010-11-27 12:26:57.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Exec=qnapi Name=QNapi -Icon=/usr/share/icons/qnapi-48.png -+Icon=@PREFIX@/share/icons/qnapi.png ++Icon=@LOCALBASE@/share/icons/qnapi.png Type=Application - Categories=Application;Multimedia;AudioVideo;Utility;Qt; + Categories=AudioVideo Comment=Program do pobierania napisów do filmów diff -ruN --exclude=CVS /usr/ports/polish/qnapi/files/patch-doc-qnapi_download.desktop /home/corn/devel/qnapi/files/patch-doc-qnapi_download.desktop --- /usr/ports/polish/qnapi/files/patch-doc-qnapi_download.desktop 2008-07-05 02:56:04.000000000 +0200 +++ /home/corn/devel/qnapi/files/patch-doc-qnapi_download.desktop 2010-11-27 12:30:33.000000000 +0100 @@ -1,11 +1,11 @@ ---- doc/qnapi-download.desktop.orig Mon Apr 7 20:55:58 2008 -+++ doc/qnapi-download.desktop Thu Apr 10 20:08:37 2008 +--- doc/qnapi-download.desktop.orig 2008-04-07 20:55:58.000000000 +0200 ++++ doc/qnapi-download.desktop 2010-11-27 12:24:23.000000000 +0100 @@ -4,7 +4,7 @@ Actions=QNapiDownload; Name=Pobierz napisy do filmu z QNapi GenericName=Pobierz napisy do filmu z QNapi -Icon=/usr/share/icons/qnapi-48.png -+Icon=@PREFIX@/share/icons/qnapi.png ++Icon=@LOCALBASE@/share/icons/qnapi.png ServiceTypes=video/x-msvideo,video/x-ms-asf,video/mpeg,video/x-ms-wmv,video/mp4,video/quicktime,video/x-theora,video/x-matroska,video/3gpp,application/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr X-KDE-ServiceTypes=KonqPopupMenu/Plugin Type=Service @@ -14,4 +14,4 @@ Name=Pobierz napisy do filmu z QNapi Exec=qnapi %F -Icon=/usr/share/icons/qnapi-48.png -+Icon=@PREFIX@/share/icons/qnapi.png ++Icon=@LOCALBASE@/share/icons/qnapi.png diff -ruN --exclude=CVS /usr/ports/polish/qnapi/files/patch-doc-qnapi_download.schemas /home/corn/devel/qnapi/files/patch-doc-qnapi_download.schemas --- /usr/ports/polish/qnapi/files/patch-doc-qnapi_download.schemas 2008-07-05 02:56:04.000000000 +0200 +++ /home/corn/devel/qnapi/files/patch-doc-qnapi_download.schemas 2010-11-27 12:31:40.000000000 +0100 @@ -1,11 +1,11 @@ ---- doc/qnapi-download.schemas.orig Sat Feb 23 11:31:20 2008 -+++ doc/qnapi-download.schemas Thu Apr 10 20:11:23 2008 +--- doc/qnapi-download.schemas.orig 2008-02-23 11:31:20.000000000 +0100 ++++ doc/qnapi-download.schemas 2010-11-27 12:24:56.000000000 +0100 @@ -32,7 +32,7 @@ The icon of the menu item The icon of the menu item that will appear next to the label in the Nautilus popup menu when the selection matches the appearance conditions settings - /usr/share/icons/qnapi.png -+ @PREFIX@/share/icons/qnapi.png ++ @LOCALBASE@/share/icons/qnapi.png /schemas/apps/nautilus-actions/configurations/12e76756-c203-4a27-830f-af5a1527869e/path diff -ruN --exclude=CVS /usr/ports/polish/qnapi/files/patch-qnapi.pro /home/corn/devel/qnapi/files/patch-qnapi.pro --- /usr/ports/polish/qnapi/files/patch-qnapi.pro 2008-07-05 02:56:04.000000000 +0200 +++ /home/corn/devel/qnapi/files/patch-qnapi.pro 2010-11-27 13:39:14.000000000 +0100 @@ -1,5 +1,5 @@ ---- 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 } @@ -9,7 +9,7 @@ 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 = $${INSTALL_PREFIX}/kde4/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 -ruN --exclude=CVS /usr/ports/polish/qnapi/files/patch-src-napi.h /home/corn/devel/qnapi/files/patch-src-napi.h --- /usr/ports/polish/qnapi/files/patch-src-napi.h 1970-01-01 01:00:00.000000000 +0100 +++ /home/corn/devel/qnapi/files/patch-src-napi.h 2010-11-27 12:40:52.000000000 +0100 @@ -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 -ruN --exclude=CVS /usr/ports/polish/qnapi/pkg-plist /home/corn/devel/qnapi/pkg-plist --- /usr/ports/polish/qnapi/pkg-plist 2008-07-05 07:29:40.000000000 +0200 +++ /home/corn/devel/qnapi/pkg-plist 2010-11-27 13:43:49.000000000 +0100 @@ -1,18 +1,18 @@ bin/qnapi +kde4/share/kde4/services/ServiceMenus/qnapi-download.desktop share/icons/qnapi.png 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 kde4/share/kde4/services/ServiceMenus +@dirrmtry kde4/share/kde4/services +@dirrmtry kde4/share/kde4 +@dirrmtry kde4/share +@dirrmtry kde4 @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 --- qnapi-0.1.5_3.patch ends here -- >Release-Note: >Audit-Trail: >Unformatted: