diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
commit | 29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch) | |
tree | 1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /polish | |
parent | 7aad84f808b93baa6a7077ce0b47573b9c4c79a0 (diff) | |
download | ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.tar.gz ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.zip |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Notes
Notes:
svn path=/head/; revision=175261
Diffstat (limited to 'polish')
-rw-r--r-- | polish/gnugadu2/Makefile | 10 | ||||
-rw-r--r-- | polish/gnugadu2/pkg-plist | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile index ab8d52a23c50..b6fdf20110b2 100644 --- a/polish/gnugadu2/Makefile +++ b/polish/gnugadu2/Makefile @@ -3,9 +3,11 @@ # Whom: smyru@heron.pl # # $FreeBSD$ +# PORTNAME= gnugadu2 PORTVERSION= 2.2.9 +PORTREVISION= 2 CATEGORIES= polish net-im MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ggadu @@ -68,7 +70,7 @@ WITH_ESOUND= yes WITH_DBUS= yes .endif -.if exists(${X11BASE}/lib/libgtkspell.so) && !defined(WITHOUT_GTKSPELL) +.if exists(${LOCALBASE}/lib/libgtkspell.so) && !defined(WITHOUT_GTKSPELL) WITH_GTKSPELL= yes .endif @@ -114,7 +116,7 @@ CONFIGURE_ARGS+= --without-gtkspell .endif .if defined(WITH_DBUS) -LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus +LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus CONFIGURE_ARGS+= --with-dbus \ --with-dbus-dir=${PREFIX}/share/dbus-1/services PLIST_SUB+= DBUS:="" @@ -171,8 +173,8 @@ post-patch: post-install: .if (${HAVE_GNOME:Mgnomehier}!="") - ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${PREFIX}/share/gnome/apps/Internet - ${LN} -sf ${PREFIX}/share/pixmaps/gg2.png ${PREFIX}/share/gnome/pixmaps + ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/gnome/apps/Internet + ${LN} -sf ${PREFIX}/share/pixmaps/gg2.png ${LOCALBASE}/share/gnome/pixmaps .endif .if exists(${LOCALBASE}/lib/libkdecore.so) ${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/applnk/Internet diff --git a/polish/gnugadu2/pkg-plist b/polish/gnugadu2/pkg-plist index 536cd957e473..276b1c9d88dd 100644 --- a/polish/gnugadu2/pkg-plist +++ b/polish/gnugadu2/pkg-plist @@ -321,8 +321,6 @@ share/gg2/themes/vblue2.theme share/gg2/themes/vgreen2.theme share/gg2/themes/vred2.theme share/gg2/themes/white2.theme -%%GNOME:%%share/gnome/apps/Internet/gg2.desktop -%%GNOME:%%share/gnome/pixmaps/gg2.png share/locale/nl/LC_MESSAGES/gg2.mo share/locale/pl/LC_MESSAGES/gg2.mo share/pixmaps/gg2.png @@ -338,5 +336,8 @@ share/pixmaps/gg2.png @dirrm share/gg2/pixmaps @dirrm share/gg2 @dirrm lib/gg2 +%%GNOME:%%@cwd %%LOCALBASE%% +%%GNOME:%%share/gnome/apps/Internet/gg2.desktop +%%GNOME:%%share/gnome/pixmaps/gg2.png %%KDE:%%@cwd %%LOCALBASE%% %%KDE:%%share/applnk/Internet/gg2.desktop |