Date: Fri, 18 Jul 2003 00:19:14 +0800 (CST) From: "Ying-Chieh Chen" <yinjieh@csie.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: cedric@cedric.trix.net Subject: ports/54590: [Update] update ports/net/kmerlin to 1.3b3 Message-ID: <200307171619.h6HGJEZc020042@alumni.csie.nctu.edu.tw> Resent-Message-ID: <200307171630.h6HGUIN1051626@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 54590
>Category: ports
>Synopsis: [Update] update ports/net/kmerlin to 1.3b3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 17 09:30:15 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Ying-Chieh Chen
>Release: FreeBSD 4.8-RELEASE i386, FreeBSD 5.1-CURRENT i386
>Organization:
yinjieh's own lab
>Environment:
System: FreeBSD stable.yinjieh.com 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Thu Apr 3 10:53:38 GMT 2003 root@freebsd-stable.sentex.ca:/usr/obj/usr/src/sys/GENERIC i386
FreeBSD stable5.yinjieh.com 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Thu Jul 17 08:28:45 CST 2003 root@stable5.yinjieh.com:/usr/obj/usr/src/sys/VMWARE i386
>Description:
Update ports/net/kmerlin to 1.3b3 and fix build.
Both tested on 4.8-RELEASE and 5.1-CURRENT.
Changes are as follows:
o Disable USE_AUTOMAKE*
o Remove pre-configure target
o Use .include <bsd.port.pre.mk> and .include <bsd.port.post.mk> instead of .include <bsd.port.mk>
o Fix pkg-plist
If the maintainer of this port think this patch ok, please submit followup, thanks!
>How-To-Repeat:
cd ${PORTSDIR}/net/kmerlin && make
>Fix:
--- kmerlin.patch begins here ---
diff -ruN /usr/ports/net/kmerlin/Makefile kmerlin/Makefile
--- /usr/ports/net/kmerlin/Makefile Sat Jun 7 02:37:50 2003
+++ kmerlin/Makefile Thu Jul 17 21:36:59 2003
@@ -6,25 +6,21 @@
#
PORTNAME= kmerlin
-PORTVERSION= 1.2
+PORTVERSION= 1.3b3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
+DISTNAME= ${PORTNAME}-1.3Beta3
-MAINTAINER= cedric@cedric.trix.net
+MAINTAINER= cedric@cedric.trix.net
COMMENT= An IM (Instant Messenger) KDE client for the Microsoft MSN Network
-BROKEN= "Does not compile"
+.include <bsd.port.pre.mk>
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOMAKE_VER=15
-USE_AUTOMAKE= yes
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include "${PORTSDIR}/x11/kde3/Makefile.kde"
CONFIGURE_ARGS+= --prefix=${LOCALBASE}
-pre-configure:
- cd ${WRKSRC} && ${GMAKE} -f Makefile.cvs
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN /usr/ports/net/kmerlin/distinfo kmerlin/distinfo
--- /usr/ports/net/kmerlin/distinfo Sat Sep 21 14:36:20 2002
+++ kmerlin/distinfo Thu Jul 17 08:23:45 2003
@@ -1 +1 @@
-MD5 (kmerlin-1.2.tar.gz) = 411bae0b9fd1f69976e8e57e9ff2e78d
+MD5 (kmerlin-1.3Beta3.tar.gz) = bef6cb2a7f953a12f212151ae80699a2
diff -ruN /usr/ports/net/kmerlin/files/patch-aa-po-fr-am kmerlin/files/patch-aa-po-fr-am
--- /usr/ports/net/kmerlin/files/patch-aa-po-fr-am Sat Sep 21 14:36:21 2002
+++ kmerlin/files/patch-aa-po-fr-am Thu Jan 1 08:00:00 1970
@@ -1,11 +0,0 @@
-*** po/fr/Makefile.am.orig Fri Sep 20 15:13:14 2002
---- po/fr/Makefile.am Fri Sep 20 15:14:01 2002
-***************
-*** 2,4 ****
-
-
-! KDE_LANG = ar
---- 2,4 ----
-
-
-! KDE_LANG = fr
diff -ruN /usr/ports/net/kmerlin/files/patch-aa-po-fr-in kmerlin/files/patch-aa-po-fr-in
--- /usr/ports/net/kmerlin/files/patch-aa-po-fr-in Sat Sep 21 14:36:21 2002
+++ kmerlin/files/patch-aa-po-fr-in Thu Jan 1 08:00:00 1970
@@ -1,15 +0,0 @@
-*** po/fr/Makefile.in.orig Fri Sep 20 15:04:48 2002
---- po/fr/Makefile.in Fri Sep 20 15:05:06 2002
-***************
-*** 226,230 ****
- GMOFILES = kmerlin.gmo
-
-! KDE_LANG = ar
- subdir = po/fr
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
---- 226,230 ----
- GMOFILES = kmerlin.gmo
-
-! KDE_LANG = fr
- subdir = po/fr
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
diff -ruN /usr/ports/net/kmerlin/pkg-plist kmerlin/pkg-plist
--- /usr/ports/net/kmerlin/pkg-plist Sat Sep 21 14:36:20 2002
+++ kmerlin/pkg-plist Thu Jul 17 22:57:19 2003
@@ -1,66 +1,75 @@
bin/kmerlin
+bin/kmerlin_client
share/applnk/Internet/kmerlin.desktop
-share/apps/kmerlin/eventsrc
-share/apps/kmerlin/kmerlinbaseui.rc
+share/apps/kmerlin/icons/hicolor/16x16/actions/chat.png
+share/apps/kmerlin/icons/hicolor/16x16/actions/hotmail.png
+share/apps/kmerlin/icons/hicolor/16x16/actions/kmaway.png
+share/apps/kmerlin/icons/hicolor/16x16/actions/kmback.png
+share/apps/kmerlin/icons/hicolor/16x16/actions/kmbsy.png
+share/apps/kmerlin/icons/hicolor/16x16/actions/kmlunch.png
+share/apps/kmerlin/icons/hicolor/16x16/actions/kmoffline.png
+share/apps/kmerlin/icons/hicolor/16x16/actions/kmonline.png
+share/apps/kmerlin/icons/hicolor/16x16/actions/kmphone.png
+share/apps/kmerlin/icons/hicolor/22x22/actions/hotmail.png
+share/apps/kmerlin/icons/hicolor/22x22/actions/kmaway.png
+share/apps/kmerlin/icons/hicolor/22x22/actions/kmoffline.png
+share/apps/kmerlin/kmerlinchatui.rc
share/apps/kmerlin/kmerlinui.rc
-share/apps/kmerlin/pics/kong.png
-share/apps/kmerlin/pics/mail.png
-share/apps/kmerlin/pics/user.png
+share/apps/kmerlin/pics/chat.png
+share/apps/kmerlin/pics/info.png
+share/apps/kmerlin/pics/network.png
+share/apps/kmerlin/pics/penguin.png
+share/apps/kmerlin/pics/top.png
+share/apps/kmerlin/smilies/README
share/apps/kmerlin/smilies/angel.png
share/apps/kmerlin/smilies/angry.png
share/apps/kmerlin/smilies/bat.png
-share/apps/kmerlin/smilies/beer.png
-share/apps/kmerlin/smilies/boy.png
+share/apps/kmerlin/smilies/beer_yum.png
+share/apps/kmerlin/smilies/bowwow.png
+share/apps/kmerlin/smilies/broken_heart.png
share/apps/kmerlin/smilies/cake.png
share/apps/kmerlin/smilies/camera.png
-share/apps/kmerlin/smilies/cat.png
share/apps/kmerlin/smilies/clock.png
-share/apps/kmerlin/smilies/coctail.png
+share/apps/kmerlin/smilies/coffee.png
share/apps/kmerlin/smilies/confused.png
share/apps/kmerlin/smilies/cry.png
-share/apps/kmerlin/smilies/cup.png
share/apps/kmerlin/smilies/devil.png
-share/apps/kmerlin/smilies/dog.png
share/apps/kmerlin/smilies/dude_hug.png
share/apps/kmerlin/smilies/embaressed.png
-share/apps/kmerlin/smilies/envelope.png
-share/apps/kmerlin/smilies/girl.png
+share/apps/kmerlin/smilies/film.png
+share/apps/kmerlin/smilies/girl_handsacross.png
share/apps/kmerlin/smilies/girl_hug.png
+share/apps/kmerlin/smilies/guy_handsacross.png
+share/apps/kmerlin/smilies/heart.png
share/apps/kmerlin/smilies/kiss.png
+share/apps/kmerlin/smilies/kittykay.png
share/apps/kmerlin/smilies/lightbulb.png
-share/apps/kmerlin/smilies/love.png
+share/apps/kmerlin/smilies/mail.png
+share/apps/kmerlin/smilies/martini_shaken.png
share/apps/kmerlin/smilies/messenger.png
share/apps/kmerlin/smilies/moon.png
-share/apps/kmerlin/smilies/note.png
+share/apps/kmerlin/smilies/musical_note.png
share/apps/kmerlin/smilies/omg.png
share/apps/kmerlin/smilies/phone.png
share/apps/kmerlin/smilies/present.png
share/apps/kmerlin/smilies/regular.png
share/apps/kmerlin/smilies/rose.png
share/apps/kmerlin/smilies/sad.png
-share/apps/kmerlin/smilies/shade.png
+share/apps/kmerlin/smilies/satisfied.png
+share/apps/kmerlin/smilies/shades.png
share/apps/kmerlin/smilies/smileyrc
share/apps/kmerlin/smilies/star.png
share/apps/kmerlin/smilies/teeth.png
-share/apps/kmerlin/smilies/thumbd.png
-share/apps/kmerlin/smilies/thumbu.png
+share/apps/kmerlin/smilies/thumbs_down.png
+share/apps/kmerlin/smilies/thumbs_up.png
share/apps/kmerlin/smilies/tounge.png
share/apps/kmerlin/smilies/ugly.png
-share/apps/kmerlin/smilies/unlove.png
+share/apps/kmerlin/smilies/whatchutalkingabout_smile.png
share/apps/kmerlin/smilies/wilted_rose.png
share/apps/kmerlin/smilies/wink.png
-share/apps/kmerlin/toolbar/away.png
-share/apps/kmerlin/toolbar/blocked.png
-share/apps/kmerlin/toolbar/e-mail.png
-share/apps/kmerlin/toolbar/filetypes.png
-share/apps/kmerlin/toolbar/invisible.png
-share/apps/kmerlin/toolbar/offline.png
-share/apps/kmerlin/toolbar/online.png
share/doc/HTML/en/kmerlin/common
share/doc/HTML/en/kmerlin/index.cache.bz2
share/doc/HTML/en/kmerlin/index.docbook
-share/icons/hicolor/16x16/apps/kmerlin.png
-share/icons/hicolor/32x32/apps/kmerlin.png
share/icons/locolor/16x16/apps/kmerlin.png
share/icons/locolor/32x32/apps/kmerlin.png
share/locale/ar/LC_MESSAGES/kmerlin.mo
@@ -69,13 +78,19 @@
share/locale/es/LC_MESSAGES/kmerlin.mo
share/locale/fr/LC_MESSAGES/kmerlin.mo
share/locale/is/LC_MESSAGES/kmerlin.mo
+share/locale/nb/LC_MESSAGES/kmerlin.mo
share/locale/nl/LC_MESSAGES/kmerlin.mo
-share/locale/zh_CN/LC_MESSAGES/kmerlin.mo
-share/locale/zh_TW/LC_MESSAGES/kmerlin.mo
+share/locale/zh-CN/LC_MESSAGES/kmerlin.mo
+share/locale/zh-TW/LC_MESSAGES/kmerlin.mo
@comment directories
@dirrm share/doc/HTML/en/kmerlin
-@dirrm share/apps/kmerlin/toolbar
+@dirrm share/apps/kmerlin/icons/hicolor/16x16/actions
+@dirrm share/apps/kmerlin/icons/hicolor/16x16
+@dirrm share/apps/kmerlin/icons/hicolor/22x22/actions
+@dirrm share/apps/kmerlin/icons/hicolor/22x22
+@dirrm share/apps/kmerlin/icons/hicolor
+@dirrm share/apps/kmerlin/icons
@dirrm share/apps/kmerlin/smilies
@dirrm share/apps/kmerlin/pics
@dirrm share/apps/kmerlin
-@dirrm share/applnk/Internet
+@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
--- kmerlin.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200307171619.h6HGJEZc020042>