Bug 76861 - Port upgrade: sysutils/k3b to 0.11.19
Summary: Port upgrade: sysutils/k3b to 0.11.19
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Volker Stolz
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-01-30 15:50 UTC by Heiner
Modified: 2005-02-07 18:54 UTC (History)
0 users

See Also:


Attachments
diff (3.12 KB, patch)
2005-02-05 16:01 UTC, Heiner
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Heiner 2005-01-30 15:50:18 UTC
Upgrade to 0.11.19

Fix: See attached diff







--Boundary-00=_2DQ/Bv1iPk8p1Kz
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="diff"



--Boundary-00=_2DQ/Bv1iPk8p1Kz----JPZuyzgpZgsDIZV6rNH8VZf01lquxFdHo3b4qeTgAKmDsuk1
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -urN ../../sysutils/k3b/Makefile ./Makefile
--- ../../sysutils/k3b/Makefile	Mon Jan 10 16:05:59 2005
+++ ./Makefile	Sun Jan 30 15:13:07 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	k3b
-PORTVERSION=	0.11.18
+PORTVERSION=	0.11.19
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -urN ../../sysutils/k3b/distinfo ./distinfo
--- ../../sysutils/k3b/distinfo	Mon Jan 10 16:05:59 2005
+++ ./distinfo	Sun Jan 30 15:14:46 2005
@@ -1,2 +1,2 @@
-MD5 (k3b-0.11.18.tar.bz2) = f5060c384c6830b51bad0451ec265326
-SIZE (k3b-0.11.18.tar.bz2) = 3189252
+MD5 (k3b-0.11.19.tar.bz2) = 4fb2ef833c78e537f9bed429b3190b83
+SIZE (k3b-0.11.19.tar.bz2) = 3190882
diff -urN ../../sysutils/k3b/pkg-plist ./pkg-plist
--- ../../sysutils/k3b/pkg-plist	Fri May 28 07:51:59 2004
+++ ./pkg-plist	Sun Jan 30 16:20:14 2005
@@ -211,7 +211,27 @@
 share/sounds/k3b_error1.wav
 share/sounds/k3b_success1.wav
 share/sounds/k3b_wait_media1.wav
+@unexec /bin/rmdir %D/share/sounds 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/mimelnk/application 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/mimelnk 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons/crystalsvg/128x128/apps 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons/crystalsvg/128x128 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons/crystalsvg 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true
 @dirrm share/doc/HTML/en/k3b
+@unexec /bin/rmdir %D/share/doc/HTML/en 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/doc/HTML 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/doc 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/apps/konqueror 2>/dev/null || /usr/bin/true
 @dirrm share/apps/k3b/plugins
 @dirrm share/apps/k3b/pics/crystal
 @dirrm share/apps/k3b/pics/73lab
@@ -227,3 +247,10 @@
 @dirrm share/apps/k3b/icons
 @dirrm share/apps/k3b/cdi
 @dirrm share/apps/k3b
+@unexec /bin/rmdir %D/share/apps 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/applnk/Multimedia 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/applnk/.hidden 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/applnk 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/lib/kde3 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/lib 2>/dev/null || /usr/bin/true
Comment 1 Volker Stolz freebsd_committer freebsd_triage 2005-02-04 15:51:15 UTC
State Changed
From-To: open->feedback

Please try if depending on misc/kdehier is more adequate then 
doing this by hand. 


Comment 2 Volker Stolz freebsd_committer freebsd_triage 2005-02-04 15:51:15 UTC
Responsible Changed
From-To: freebsd-ports-bugs->vs

I'll track this.
Comment 3 Michael Nottebrock 2005-02-04 16:19:25 UTC
There is no need for this port to explicitly depend on kdehier, the dependency 
is automatically brought in via USE_KDELIBS_VER.

-- 
   ,_,   | Michael Nottebrock               | lofi@freebsd.org
 (/^ ^\) | FreeBSD - The Power to Serve     | http://www.freebsd.org
   \u/   | K Desktop Environment on FreeBSD | http://freebsd.kde.org
Comment 4 Mikhail Teterin 2005-02-04 22:05:30 UTC
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76861

FYI, the k3b-0.11.20 is out today.

	-mi
Comment 5 Heiner 2005-02-05 16:01:48 UTC
You are right. Here is the update to 0.11.20

Heiner
Comment 6 Mikhail Teterin 2005-02-07 15:24:20 UTC
> You are right. Here is the update to 0.11.20
>
> Heiner

Thanks for the updated patch, Heiner, but your e-mail does not address earlier 
asked questions about the wisdom of explicit removal of KDE-hierarchy's 
directories. Can I commit the update of Makefile/distfiles while you are 
discussing the pkg-plist changes? Thanks!

	-mi
Comment 7 Michael Nottebrock 2005-02-07 16:02:35 UTC
On Monday, 7. February 2005 16:24, Mikhail Teterin wrote:
> > You are right. Here is the update to 0.11.20
> >
> > Heiner
>
> Thanks for the updated patch, Heiner, but your e-mail does not address
> earlier asked questions about the wisdom of explicit removal of
> KDE-hierarchy's directories. Can I commit the update of Makefile/distfiles
> while you are discussing the pkg-plist changes?

FWIW, it's really just cosmetics either way. All (or most) of those @unexec 
gymnastics are not needed anymore since kdehier, but they don't hurt either.

-- 
   ,_,   | Michael Nottebrock               | lofi@freebsd.org
 (/^ ^\) | FreeBSD - The Power to Serve     | http://www.freebsd.org
   \u/   | K Desktop Environment on FreeBSD | http://freebsd.kde.org
Comment 8 Heiner 2005-02-07 18:42:24 UTC
Ah, now I understand the initial question. I had some trouble with other 
ports, where I did NOT have these @unexec's, so I added them here as well. If 
they are useless, please remove them. Should I create another patch?


Heiner
Comment 9 Mikhail Teterin 2005-02-07 18:46:41 UTC
ÐÏÎÅĦÌÏË 07 ÌÀÔÉÊ 2005 13:42, Heiner ÷É ÎÁÐÉÓÁÌÉ:
> Ah, now I understand the initial question. I had some trouble with other
> ports, where I did NOT have these @unexec's, so I added them here as well.
> If they are useless, please remove them. Should I create another patch?

No, thanks. It is simple enough :-)

	-mi
Comment 10 Mikhail Teterin freebsd_committer freebsd_triage 2005-02-07 18:54:23 UTC
State Changed
From-To: feedback->closed

Update to 0.11.20 committed. Thanks.