From tabthorpe@goodking.goodking.ca Thu Oct 26 18:51:47 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD33516A4B3 for ; Thu, 26 Oct 2006 18:51:47 +0000 (UTC) (envelope-from tabthorpe@goodking.goodking.ca) Received: from tbaytel.net (front2-g.tbaytel.net [216.211.26.166]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AC3143D7B for ; Thu, 26 Oct 2006 18:51:29 +0000 (GMT) (envelope-from tabthorpe@goodking.goodking.ca) Received: from goodking.goodking.ca ([216.211.72.166] verified) by front2.tbaytel.net (CommuniGate Pro SMTP 5.0.8) with ESMTPS id 60594480 for FreeBSD-gnats-submit@freebsd.org; Thu, 26 Oct 2006 14:51:19 -0400 Received: from goodking.goodking.ca (localhost [127.0.0.1]) by goodking.goodking.ca (8.13.8/8.13.8) with ESMTP id k9QIp0WC013201 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 26 Oct 2006 14:51:00 -0400 (EDT) (envelope-from tabthorpe@goodking.goodking.ca) Received: (from root@localhost) by goodking.goodking.ca (8.13.8/8.13.8/Submit) id k9QIp0Nv013200; Thu, 26 Oct 2006 14:51:00 -0400 (EDT) (envelope-from tabthorpe) Message-Id: <200610261851.k9QIp0Nv013200@goodking.goodking.ca> Date: Thu, 26 Oct 2006 14:51:00 -0400 (EDT) From: Thomas Abthorpe To: FreeBSD-gnats-submit@freebsd.org Cc: thomas@goodking.ca Subject: [PATCH] deskutils/knowit: fix pkg-plist, pet porlint X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 104837 >Category: ports >Synopsis: [PATCH] deskutils/knowit: fix pkg-plist, pet porlint >Confidential: no >Severity: non-critical >Priority: low >Responsible: alepulver >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Oct 26 19:00:35 GMT 2006 >Closed-Date: Mon Nov 06 17:20:29 GMT 2006 >Last-Modified: Mon Nov 06 17:20:29 GMT 2006 >Originator: Thomas Abthorpe >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: GoodKing.Ca >Environment: System: FreeBSD goodking.goodking.ca 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #2: Mon Oct 2 02:05:54 EDT >Description: - fix pkg-plist, adresses http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.7.2006101922/knowit-0.10_3.log - use INSTALLS_ICONS to pet portlint. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- knowit-0.10_3.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/knowit/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 15 Aug 2006 08:27:46 -0000 1.18 +++ Makefile 26 Oct 2006 18:48:32 -0000 @@ -21,6 +21,7 @@ USE_KDELIBS_VER= 3 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 +INSTALLS_ICONS= yes MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \ AUTOMAKE="${TRUE}" Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/deskutils/knowit/pkg-plist,v retrieving revision 1.9 diff -u -r1.9 pkg-plist --- pkg-plist 15 Aug 2006 07:56:18 -0000 1.9 +++ pkg-plist 26 Oct 2006 18:48:32 -0000 @@ -18,12 +18,6 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/knowit.mo @dirrmtry share/mimelnk/application @dirrmtry share/mimelnk -@dirrmtry share/icons/hicolor/32x32/apps -@dirrmtry share/icons/hicolor/32x32 -@dirrmtry share/icons/hicolor/16x16/apps -@dirrmtry share/icons/hicolor/16x16 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons @dirrm share/doc/HTML/en/knowit @dirrmtry share/doc/HTML/en @dirrmtry share/doc/HTML --- knowit-0.10_3.patch ends here --- >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->alepulver Responsible-Changed-By: alepulver Responsible-Changed-When: Tue Oct 31 23:05:58 UTC 2006 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=104837 From: "Thomas Abthorpe" To: , Cc: Subject: Re: ports/104837: [PATCH] deskutils/knowit: fix pkg-plist, pet porlint Date: Sat, 4 Nov 2006 00:14:06 -0500 This is a multi-part message in MIME format. ------=_NextPart_000_0027_01C6FFA6.246CEC50 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Please accept the following patch amendments Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/deskutils/knowit/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 15 Aug 2006 08:27:46 -0000 1.18 +++ Makefile 4 Nov 2006 05:12:51 -0000 @@ -21,12 +21,15 @@ USE_KDELIBS_VER=3D 3 USE_GMAKE=3D yes USE_AUTOTOOLS=3D libtool:15 +INSTALLS_ICONS=3D yes MAKE_ARGS=3D ACLOCAL=3D"${TRUE}" AUTOCONF=3D"${TRUE}" = AUTOHEADER=3D"${TRUE}" \ AUTOMAKE=3D"${TRUE}" QTCPPFLAGS+=3D ${PTHREAD_CFLAGS} QTCFGLIBS+=3D ${PTHREAD_LIBS} +DOCSDIR=3Dshare/doc/HTML + post-patch: @${REINPLACE_CMD} -e 's|-O2||g ; \ s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure Index: pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/deskutils/knowit/pkg-plist,v retrieving revision 1.9 diff -u -r1.9 pkg-plist --- pkg-plist 15 Aug 2006 07:56:18 -0000 1.9 +++ pkg-plist 4 Nov 2006 05:14:06 -0000 @@ -2,10 +2,10 @@ share/applnk/Applications/knowit.desktop share/apps/knowit/knowitui.rc share/apps/knowit/tips -share/doc/HTML/en/knowit/common -share/doc/HTML/en/knowit/index.cache.bz2 -share/doc/HTML/en/knowit/index.docbook -share/doc/HTML/en/knowit/screenshot.png +%%DOCSDIR%%/en/knowit/common +%%DOCSDIR%%/en/knowit/index.cache.bz2 +%%DOCSDIR%%/en/knowit/index.docbook +%%DOCSDIR%%/en/knowit/screenshot.png share/icons/hicolor/16x16/apps/knowit.png share/icons/hicolor/32x32/apps/knowit.png share/locale/de/LC_MESSAGES/knowit.mo @@ -18,15 +18,9 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/knowit.mo @dirrmtry share/mimelnk/application @dirrmtry share/mimelnk -@dirrmtry share/icons/hicolor/32x32/apps -@dirrmtry share/icons/hicolor/32x32 -@dirrmtry share/icons/hicolor/16x16/apps -@dirrmtry share/icons/hicolor/16x16 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons -@dirrm share/doc/HTML/en/knowit -@dirrmtry share/doc/HTML/en -@dirrmtry share/doc/HTML +@dirrm %%DOCSDIR%%/en/knowit +@dirrmtry %%DOCSDIR%%/en +@dirrmtry %%DOCSDIR%% @dirrm share/apps/knowit @dirrmtry share/applnk/Applications @dirrmtry share/applnk ------=_NextPart_000_0027_01C6FFA6.246CEC50 Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable
Please accept the following patch=20 amendments
 
Index:=20 Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS=20 file: /home/ncvs/ports/deskutils/knowit/Makefile,v
retrieving = revision=20 1.18
diff -u -r1.18 Makefile
--- Makefile    15 Aug = 2006=20 08:27:46 -0000      1.18
+++=20 Makefile    4 Nov 2006 05:12:51 -0000
@@ -21,12 +21,15 = @@
 USE_KDELIBS_VER=3D      =20 3
 USE_GMAKE=3D     = yes
 USE_AUTOTOOLS=3D=20 libtool:15
+INSTALLS_ICONS=3D       = ;=20 yes
 MAKE_ARGS=3D     ACLOCAL=3D"${TRUE}"=20 AUTOCONF=3D"${TRUE}" AUTOHEADER=3D"${TRUE}"=20 \
           &n= bsp;   =20 AUTOMAKE=3D"${TRUE}"
 
 QTCPPFLAGS+=3D  =20 ${PTHREAD_CFLAGS}
 QTCFGLIBS+=3D   =20 ${PTHREAD_LIBS}
 
+DOCSDIR=3Dshare/doc/HTML
+
 post-patch:
&nb= sp;      =20 @${REINPLACE_CMD} -e 's|-O2||g ;=20 \
           &n= bsp;    =20 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
Index:=20 pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS= =20 file: /home/ncvs/ports/deskutils/knowit/pkg-plist,v
retrieving = revision=20 1.9
diff -u -r1.9 pkg-plist
--- pkg-plist   15 Aug 2006 = 07:56:18=20 -0000      1.9
+++ pkg-plist   4 = Nov 2006=20 05:14:06 -0000
@@ -2,10 +2,10=20 @@
 share/applnk/Applications/knowit.desktop
 share/apps/= knowit/knowitui.rc
 share/apps/knowit/tips
-share/doc/HTML/en/= knowit/common
-share/doc/HTML/en/knowit/index.cache.bz2
-share/doc/= HTML/en/knowit/index.docbook
-share/doc/HTML/en/knowit/screenshot.png<= BR>+%%DOCSDIR%%/en/knowit/common
+%%DOCSDIR%%/en/knowit/index.cache.bz= 2
+%%DOCSDIR%%/en/knowit/index.docbook
+%%DOCSDIR%%/en/knowit/scree= nshot.png
 share/icons/hicolor/16x16/apps/knowit.png
 sha= re/icons/hicolor/32x32/apps/knowit.png
 share/locale/de/LC_MESSAG= ES/knowit.mo
@@=20 -18,15 +18,9=20 @@
 share/locale/zh_CN.GB2312/LC_MESSAGES/knowit.mo
 @dir= rmtry=20 share/mimelnk/application
 @dirrmtry share/mimelnk
-@dirrmtry = share/icons/hicolor/32x32/apps
-@dirrmtry = share/icons/hicolor/32x32
-@dirrmtry = share/icons/hicolor/16x16/apps
-@dirrmtry = share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrm share/doc/HTML/en/knowit
-@dirrmtry share/doc/HTML/en
-@dirrmtry share/doc/HTML
+@dirrm %%DOCSDIR%%/en/knowit
+@dirrmtry %%DOCSDIR%%/en
+@dirrmtry %%DOCSDIR%%
 @dirrm=20 share/apps/knowit
 @dirrmtry=20 share/applnk/Applications
 @dirrmtry = share/applnk
 
------=_NextPart_000_0027_01C6FFA6.246CEC50-- State-Changed-From-To: open->closed State-Changed-By: alepulver State-Changed-When: Mon Nov 6 17:20:25 UTC 2006 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=104837 >Unformatted: