ports/123716: [patch] unbreak and cleanup of polish/gnugadu2
Piotr Smyrak
smyru at heron.pl
Thu May 15 22:20:02 UTC 2008
>Number: 123716
>Category: ports
>Synopsis: [patch] unbreak and cleanup of polish/gnugadu2
>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: Thu May 15 22:20:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Piotr Smyrak
>Release: FreeBSD 6.3-STABLE i386
>Organization:
>Environment:
FreeBSD smyru.smyrak.com 6.3-STABLE FreeBSD 6.3-STABLE #1: Wed Feb 20 09:07:31 CET 2008 root at smyru.smyrak.com:/usr/obj/usr/src/sys/SMYRU i386
>Description:
Currently the latest commit to polish/libgadu breaks polish/gnugadu2 when the build is OpenSSL enabled, but there is an undergoing work to fix it. A fix is pending to be commited in PR ports/122394.
Meanwhile I fixed some spotted minor issues with pkg-plist (that's why revision was bumped) in polish/gnugadu2 and reorganized the port Makefile to meet current state of other ports (GNOME etc.).
A patch is attached. Please commit when aforementioned ports/122394 hits the tree.
>How-To-Repeat:
N/A
>Fix:
Patch attached with submission follows:
--- Makefile.orig 2008-05-15 18:28:13.000000000 +0200
+++ Makefile 2008-05-16 00:03:35.000000000 +0200
@@ -7,28 +7,28 @@
PORTNAME= gnugadu2
PORTVERSION= 2.3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= polish net-im
MASTER_SITES= SF/ggadu
DISTNAME= gg2-${PORTVERSION}
MAINTAINER= smyru at heron.pl
-COMMENT= GTK2 based Gadu-Gadu client for X11
+COMMENT= Gadu-Gadu IM network client
LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/libgadu \
audiofile.0:${PORTSDIR}/audio/libaudiofile
-BROKEN= Does not configure
-
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_PERL5= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gtk20
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
+USE_PERL5= yes
USE_XORG= x11 xaw ice
WANT_GNOME= yes
+# there is a header conflict here, that breaks build
CONFLICTS= qhacc-[0-9]*
CONFIGURE_ARGS= --disable-esdtest \
@@ -153,29 +153,13 @@
PLIST_SUB+= XOSD:="@comment "
.endif
-.if (${HAVE_GNOME:Mgnomehier}!="")
-PLIST_SUB+= GNOME:=""
-.else
-PLIST_SUB+= GNOME:="@comment "
-.endif
-.if exists(${LOCALBASE}/lib/libkdecore.so)
-PLIST_SUB+= KDE:=""
-.else
-PLIST_SUB+= KDE:="@comment "
-.endif
-
post-patch:
- @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/gg2.desktop
- @${REINPLACE_CMD} -e 's| -ldl|| ; s|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/lib/Makefile.in
+ @${REINPLACE_CMD} -e 's,=.*},=${PREFIX},' ${WRKSRC}/src/plugins/dbus/org.freedesktop.im.GG.service
+ @${REINPLACE_CMD} -e 's, -ldl,, ; s,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' ${WRKSRC}/lib/Makefile.in
+ @${REINPLACE_CMD} -e 's,(datadir)/pixmaps,(datadir)/icons/hicolor/48x48/apps,' ${WRKSRC}/pixmaps/Makefile.in
post-install:
-.if (${HAVE_GNOME:Mgnomehier}!="")
- ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/gnome/apps/Internet
- ${LN} -sf ${PREFIX}/share/pixmaps/gg2.png ${LOCALBASE}/share/pixmaps
-.endif
-.if exists(${LOCALBASE}/lib/libkdecore.so)
- ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/applnk/Internet
-.endif
+ ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/applications/
# vim: set ts=8 sw=8:
.include <bsd.port.post.mk>
--- pkg-plist.orig 2008-05-15 18:30:20.000000000 +0200
+++ pkg-plist 2008-05-15 18:35:00.000000000 +0200
@@ -40,6 +40,7 @@
lib/libgg2_core.so.2
libdata/pkgconfig/gg2_core.pc
%%DBUS:%%share/dbus-1/services/org.freedesktop.im.GG.service
+share/applications/gg2.desktop
share/gg2/pixmaps/arrow.png
share/gg2/pixmaps/away.png
share/gg2/pixmaps/emoticon.gif
@@ -321,9 +322,9 @@
share/gg2/themes/vgreen2.theme
share/gg2/themes/vred2.theme
share/gg2/themes/white2.theme
+share/icons/hicolor/48x48/apps/gg2.png
share/locale/nl/LC_MESSAGES/gg2.mo
share/locale/pl/LC_MESSAGES/gg2.mo
-share/pixmaps/gg2.png
@dirrm share/gg2/themes
@dirrm share/gg2/sounds
@dirrm share/gg2/pixmaps/icons/rozgwiazda
@@ -336,8 +337,4 @@
@dirrm share/gg2/pixmaps
@dirrm share/gg2
@dirrm lib/gg2
-%%GNOME:%%@cwd %%LOCALBASE%%
-%%GNOME:%%share/gnome/apps/Internet/gg2.desktop
-%%GNOME:%%share/pixmaps/gg2.png
-%%KDE:%%@cwd %%LOCALBASE%%
-%%KDE:%%share/applnk/Internet/gg2.desktop
+ at dirrmtry share/applications
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list