From 29747f458a1eb2ce23b4594b09d0256dd62760b8 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sat, 14 Oct 2006 08:54:54 +0000
Subject: 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)
---
 net-im/skype/Makefile  | 16 ++++------------
 net-im/skype/pkg-plist |  5 +++--
 2 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'net-im/skype')

diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index 4ede7293a721..20c6dee50d74 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	1.2.0.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 DISTNAME=	skype_staticQT-${PORTVERSION}
@@ -29,33 +29,25 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
 USE_BZIP2=	yes
 USE_LINUX=	yes
 USE_X_PREFIX=	yes
-WANT_GNOME=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
 RESTRICTED=	Redistribution not allowed yet.
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgnomehier} != ""
-PLIST_SUB+=	GNOME=""
-.else
-PLIST_SUB+=	GNOME="@comment "
-.endif
-
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
+	@${MKDIR} ${PREFIX}/share/applications
 	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
 #	${INSTALL} ${WRKSRC}/skype-callto-handler ${PREFIX}/bin/
 	${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"\$$@\" 2>&1 | grep -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype
 	${CHMOD} a+rx ${PREFIX}/bin/skype
-.if ${HAVE_GNOME:Mgnomehier} != ""
-	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
-	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
-.endif
+	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png
 	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
 	${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
diff --git a/net-im/skype/pkg-plist b/net-im/skype/pkg-plist
index d1ddac4c78ab..b7763d3ec4ac 100644
--- a/net-im/skype/pkg-plist
+++ b/net-im/skype/pkg-plist
@@ -35,5 +35,6 @@ bin/skype_bin
 @dirrm %%DATADIR%%/sound
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
-%%GNOME%%share/gnome/applications/skype.desktop
-%%GNOME%%share/gnome/pixmaps/skype.png
+share/applications/skype.desktop
+share/pixmaps/skype.png
+@dirrmtry share/applications
-- 
cgit v1.2.3