Index: head/net/skype/Makefile =================================================================== --- head/net/skype/Makefile (revision 181817) +++ head/net/skype/Makefile (revision 181818) @@ -1,60 +1,62 @@ # New ports collection makefile for: skype # Date created: Jun 21. 2004 # Whom: netchild@FreeBSD.org # # $FreeBSD$ # PORTNAME= skype PORTVERSION= 1.2.0.18 PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://download.skype.com/linux/ DISTNAME= skype_staticQT-${PORTVERSION} MAINTAINER= itetcu@FreeBSD.org COMMENT= P2P VoIP software CONFLICTS+= skype-devel-[0-9]* RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \ ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat -.ifdef WITH_NVIDIA_GL -RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -.else -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri -.endif - USE_BZIP2= yes USE_LINUX= yes USE_X_PREFIX= yes ONLY_FOR_ARCHS= i386 amd64 RESTRICTED= Redistribution not allowed yet. +OPTIONS= WITH_NVIDIA_GL "Enable Nvidia Support" off + .include + +.if !defined(WITH_NVIDIA_GL) +RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver +.else +RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri +.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 ${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/ ${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/sound/ ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/ post-install: @${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. It is fixed in 6.x. Additionally there is some further work in the sound subsystem going on which fixes some related problems. This work will not be available in 6.0-RELEASE. If you experience problems update to the most recent 6.x-RELEASE, if this does not fix your problems ask on multimedia@FreeBSD.org." | fmt .include Property changes on: head/net/skype/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.29 \ No newline at end of property +1.30 \ No newline at end of property Index: head/net-im/skype/Makefile =================================================================== --- head/net-im/skype/Makefile (revision 181817) +++ head/net-im/skype/Makefile (revision 181818) @@ -1,60 +1,62 @@ # New ports collection makefile for: skype # Date created: Jun 21. 2004 # Whom: netchild@FreeBSD.org # # $FreeBSD$ # PORTNAME= skype PORTVERSION= 1.2.0.18 PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://download.skype.com/linux/ DISTNAME= skype_staticQT-${PORTVERSION} MAINTAINER= itetcu@FreeBSD.org COMMENT= P2P VoIP software CONFLICTS+= skype-devel-[0-9]* RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \ ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat -.ifdef WITH_NVIDIA_GL -RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -.else -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri -.endif - USE_BZIP2= yes USE_LINUX= yes USE_X_PREFIX= yes ONLY_FOR_ARCHS= i386 amd64 RESTRICTED= Redistribution not allowed yet. +OPTIONS= WITH_NVIDIA_GL "Enable Nvidia Support" off + .include + +.if !defined(WITH_NVIDIA_GL) +RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver +.else +RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri +.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 ${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/ ${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/sound/ ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/ post-install: @${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. It is fixed in 6.x. Additionally there is some further work in the sound subsystem going on which fixes some related problems. This work will not be available in 6.0-RELEASE. If you experience problems update to the most recent 6.x-RELEASE, if this does not fix your problems ask on multimedia@FreeBSD.org." | fmt .include Property changes on: head/net-im/skype/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.29 \ No newline at end of property +1.30 \ No newline at end of property Index: head/net-im/skype20/Makefile =================================================================== --- head/net-im/skype20/Makefile (revision 181817) +++ head/net-im/skype20/Makefile (revision 181818) @@ -1,60 +1,62 @@ # New ports collection makefile for: skype # Date created: Jun 21. 2004 # Whom: netchild@FreeBSD.org # # $FreeBSD$ # PORTNAME= skype PORTVERSION= 1.2.0.18 PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://download.skype.com/linux/ DISTNAME= skype_staticQT-${PORTVERSION} MAINTAINER= itetcu@FreeBSD.org COMMENT= P2P VoIP software CONFLICTS+= skype-devel-[0-9]* RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \ ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat -.ifdef WITH_NVIDIA_GL -RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -.else -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri -.endif - USE_BZIP2= yes USE_LINUX= yes USE_X_PREFIX= yes ONLY_FOR_ARCHS= i386 amd64 RESTRICTED= Redistribution not allowed yet. +OPTIONS= WITH_NVIDIA_GL "Enable Nvidia Support" off + .include + +.if !defined(WITH_NVIDIA_GL) +RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver +.else +RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri +.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 ${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/ ${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/sound/ ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/ post-install: @${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. It is fixed in 6.x. Additionally there is some further work in the sound subsystem going on which fixes some related problems. This work will not be available in 6.0-RELEASE. If you experience problems update to the most recent 6.x-RELEASE, if this does not fix your problems ask on multimedia@FreeBSD.org." | fmt .include Property changes on: head/net-im/skype20/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.29 \ No newline at end of property +1.30 \ No newline at end of property