Index: head/emulators/open-vm-tools/Makefile =================================================================== --- head/emulators/open-vm-tools/Makefile (revision 489671) +++ head/emulators/open-vm-tools/Makefile (revision 489672) @@ -1,94 +1,94 @@ # Created by: mbr@FreeBSD.org # $FreeBSD$ PORTNAME= open-vm-tools PORTVERSION= ${RELEASE_VER} PORTREVISION= 1 DISTVERSIONPREFIX= stable- PORTEPOCH= 2 CATEGORIES= emulators MAINTAINER= jpaetzel@FreeBSD.org COMMENT?= Open VMware tools for FreeBSD VMware guests LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libmspack.so:archivers/libmspack \ libdnet.so:net/libdnet RELEASE_VER= 10.3.0 BUILD_VER= 8931395 OPTIONS_DEFINE= LIBNOTIFY OPENSSL X11 OPTIONS_DEFAULT= LIBNOTIFY OPENSSL X11 OPTIONS_SUB= LIBNOTIFY_DESC= Desktop notification support X11_CONFIGURE_WITH= x gtk2 gtkmm X11_USE= xorg=ice,sm,x11,xext,xi,xinerama,xorgproto,xrandr,xrender,xtst \ gnome=gdkpixbuf2,gtk20,gtkmm24 X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 LIBNOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify OPENSSL_CONFIGURE_WITH= ssl WRKSRC_SUBDIR= open-vm-tools GNU_CONFIGURE= yes USES= autoreconf fuse gettext-runtime kmod libtool localbase pathfix pkgconfig gnome USE_GNOME= glib20 USE_GITHUB= yes GH_ACCOUNT= vmware USE_LDCONFIG= yes CPPFLAGS+= -Wno-deprecated-declarations SSP_UNSAFE= kernel module does not support ssp CONFIGURE_ARGS+= --without-icu \ --disable-vgauth \ --sysconfdir=${PREFIX}/etc CONFLICTS+= vmware-guestd[0-9]* vmware-tools[0-9]* USE_RC_SUBR= vmware-guestd vmware-kmod INSTALL_TARGET= install-strip .include .if ${PORT_OPTIONS:MX11} -CONFLICTS= open-vm-tools-nox11-[0-9]* +CONFLICTS+= open-vm-tools-nox11-[0-9]* .else -CONFLICTS= open-vm-tools-[0-9]* +CONFLICTS+= open-vm-tools-[0-9]* .endif CONFIGURE_ENV+= SYSDIR=${SRC_BASE}/sys .include post-patch: @${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@"\ ${WRKSRC}/lib/guestApp/guestApp.c post-build: cd ${WRKSRC}/modules && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/input ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmxnet.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/vmware/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/tests/ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.conf.d .include Index: head/net/concourse-fly/Makefile =================================================================== --- head/net/concourse-fly/Makefile (revision 489671) +++ head/net/concourse-fly/Makefile (revision 489672) @@ -1,68 +1,66 @@ # $FreeBSD$ PORTNAME= concourse PORTVERSION= 4.2.1 CATEGORIES= net sysutils MASTER_SITES= LOCAL/dumbbell/concourse/ PKGNAMESUFFIX= -fly MAINTAINER= dumbbell@FreeBSD.org COMMENT= CLI for Concourse LICENSE= APACHE20 -CONFLICTS_INSTALL= fly - GO_CMD= ${LOCALBASE}/bin/go GO_PKGNAME= github.com/concourse/fly USES= go tar:xz CONFLICTS_INSTALL= fly PLIST_FILES= bin/fly # The build instructions for `fly` suggest to clone the global Concourse # repository, which contains many Git submodules, including fly, and # build from there. So basically: # # git clone --recursive https://github.com/concourse/concourse.gi # cd concourse # export GOPATH=$PWD # cd src/github.com/concourse/fly # go build # # Therefore, the source archive contains the Concourse top-level # repository and all its submodules. It's created using the # create-src-archive below: # # make create-src-archive # # Because it doesn't match the project layout USES=go expects, we # override the post-extract and do-build targets to adapt the commands. # # `fly` version is set by default to "0.0.0-dev" in version/Version.go. # Instead of patching the file, we use a linker flag to set the variable # to the port's version. post-extract: ${LN} -sf ${WRKSRC}/src ${GO_WRKDIR_SRC} do-build: (cd ${WRKDIR}; \ ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} \ 'install' -v -ldflags="-X github.com/concourse/fly/version.Version=${PORTVERSION}" ${GO_TARGET}) .PHONY: create-src-archive ARCHIVE_DIR= ${DISTDIR}/concourse-${PORTVERSION} create-src-archive: ${RM} -rf ${ARCHIVE_DIR} git clone --recursive -b v${PORTVERSION} \ https://github.com/concourse/concourse.git \ ${ARCHIVE_DIR} ${FIND} ${ARCHIVE_DIR} \( -name ".git*" -o -name "testdata" \) -depth -exec ${RM} -rf {} \; ${TAR} -cf - -C ${ARCHIVE_DIR:H} ${ARCHIVE_DIR:T} | ${XZ_CMD} > ${ARCHIVE_DIR}.tar.xz ${RM} -rf ${ARCHIVE_DIR} ${MAKE} makesum .include Index: head/net-im/skype-devel/Makefile =================================================================== --- head/net-im/skype-devel/Makefile (revision 489671) +++ head/net-im/skype-devel/Makefile (revision 489672) @@ -1,66 +1,64 @@ # Created by: netchild@FreeBSD.org # $FreeBSD$ PORTNAME= skype PORTVERSION= 2.2.0.35 PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= http://download.skype.com/linux/ PKGNAMESUFFIX= -devel DISTNAME= skype_static-${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= P2P VoIP software, development version -CONFLICTS= skype-[0-9]* - OPTIONS_DEFINE= DOCS VIDEO OPTIONS_DEFAULT=VIDEO VIDEO_DESC= [broken] Video support CONFLICTS= skype-1* skype-2.0* skype-2.1* NO_BUILD= yes USES= cpe linux tar:bzip2 USE_LINUX= alsalib alsa-plugins-oss dri expat fontconfig libasyncns \ libsigcpp20 xorglibs BROKEN= uses non existing libsigcpp20 RESTRICTED= Redistribution prohibited. WRKSRC= ${WRKDIR}/${PORTNAME}_static-${DISTVERSION} SKYPEDIR= share/skype PORTDOCS= LICENSE README PLIST_SUB+= SKYPEDIR=${SKYPEDIR} SUB_FILES= skype.sh SUB_LIST+= SKYPEDIR=${SKYPEDIR} .include .if ${PORT_OPTIONS:MVIDEO} RUN_DEPENDS+= webcamd:multimedia/webcamd USE_LINUX+= libv4l SUB_LIST+= VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so " .else SUB_LIST+= VIDEO="" .endif do-install: @${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${STAGEDIR}${PREFIX}/share/applications/ @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${STAGEDIR}${PREFIX}/share/pixmaps/skype.png @cd ${WRKSRC}/ && ${MKDIR} ${STAGEDIR}${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ # The binary main program @${INSTALL_PROGRAM} ${WRKSRC}/skype ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ # The wrapper for main program @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${STAGEDIR}${PREFIX}/bin/skype @${CHMOD} a+rx ${STAGEDIR}${PREFIX}/bin/skype .if ${PORT_OPTIONS:MDOCS} @${INSTALL} -d ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include