Index: head/misc/e2fsprogs-libuuid/Makefile =================================================================== --- head/misc/e2fsprogs-libuuid/Makefile (revision 410453) +++ head/misc/e2fsprogs-libuuid/Makefile (revision 410454) @@ -1,49 +1,47 @@ # Created by: Matthias Andree # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= misc devel PKGNAMESUFFIX= -libuuid COMMENT= UUID library from e2fsprogs package - -CONFLICTS= ossp-uuid-[0-9]* CONFIGURE_ARGS= --enable-elf-shlibs OPTIONS_EXCLUDE= NLS MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs MAKE_ARGS= LIB_SUBDIRS=lib/uuid USE_LDCONFIG= yes ALL_TARGET= libs INSTALL_TARGET= install install-shlibs INSTALL_WRKSRC= ${WRKSRC}/lib/uuid FILESDIR= ${.CURDIR}/files USE_RC_SUBR= uuidd PKGDIR= ${.CURDIR} post-patch:: ${REINPLACE_CMD} -e 's,/var/lib/libuuid,/var/run/libuuid,g' \ -e 's,/usr/sbin/uuidd,${PREFIX}/sbin/uuidd,' \ ${WRKSRC}/lib/uuid/*.[ch] pre-build: ${MKDIR} ${WRKSRC}/lib/uuid/elfshared cd ${WRKSRC}/util && ${MAKE_CMD} subst # ulimit guards against runaway tests # failure to launch uuidd is fine (one might be running, or we may lack # privileges); if it works, it'll quit after 50 seconds post-build: cd ${WRKSRC}/misc && ${MAKE_CMD} uuidgen uuidgen.1 uuidd uuidd.8 cd ${INSTALL_WRKSRC} && ( ulimit -t 5 && ${MAKE_CMD} check ) post-install: ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidgen ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/misc/uuidgen.1 ${STAGEDIR}${MAN8PREFIX}/man/man1/ ${INSTALL_PROGRAM} ${WRKSRC}/misc/uuidd ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_MAN} ${WRKSRC}/misc/uuidd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/ ${MKDIR} ${STAGEDIR}/var/run/libuuid .include "${MASTERDIR}/Makefile" Index: head/misc/ossp-uuid/Makefile =================================================================== --- head/misc/ossp-uuid/Makefile (revision 410453) +++ head/misc/ossp-uuid/Makefile (revision 410454) @@ -1,32 +1,35 @@ # Created by: Kimura Fuyuki # $FreeBSD$ PORTNAME= uuid PORTVERSION= 1.6.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= misc devel MASTER_SITES= OSSP/lib/${PORTNAME} PKGNAMEPREFIX= ossp- MAINTAINER= vd@FreeBSD.org COMMENT= ISO-C API and CLI for generating Universally Unique Identifiers GNU_CONFIGURE= yes USES+= libtool pathfix USE_LDCONFIG= yes CONFIGURE_ARGS= --with-cxx \ --includedir=${PREFIX}/include/ossp .if defined(SLAVEPORT) && ${SLAVEPORT}=="perl" PKGNAMEPREFIX= p5-OSSP- -.else -CONFLICTS= e2fsprogs-libuuid-[0-9]* .endif regression-test: test + +pre-patch: +### Fixes lib conflicts with misc/e2fsprogs-libuuid ### + ${REINPLACE_CMD} 's/libuuid.la/libossp-uuid.la/ ; s/libuuid++.la/libossp-uuid++.la/' \ + ${WRKDIR}/${DISTNAME}/Makefile.in test: build @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} check) .include Index: head/misc/ossp-uuid/files/patch-Makefile.in =================================================================== --- head/misc/ossp-uuid/files/patch-Makefile.in (nonexistent) +++ head/misc/ossp-uuid/files/patch-Makefile.in (revision 410454) @@ -0,0 +1,35 @@ +### This Patch is to fix conflicts with misc/e2fsprogs-libuuid ### +--- Makefile.in.orig 2016-02-07 14:59:23 UTC ++++ Makefile.in +@@ -74,7 +74,7 @@ CXX_OBJS = uuid++.lo $(LIB_OBJS) + PRG_NAME = uuid + PRG_OBJS = uuid_cli.o + +-MAN_NAME = uuid.3 uuid++.3 uuid.1 ++MAN_NAME = ossp-uuid.3 ossp-uuid++.3 uuid.1 + + PERL_NAME = $(S)/perl/blib/lib/OSSP/uuid.pm + PERL_OBJS = $(S)/perl/uuid.pm +@@ -231,7 +231,7 @@ install: + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 + $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/ + $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/ +- $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/ ++ $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/ossp-uuid.pc + $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/ + -@if [ ".$(WITH_DCE)" = .yes ]; then \ + echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \ +@@ -241,10 +241,10 @@ install: + echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \ + $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \ + fi +- $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ ++ $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3 + -@if [ ".$(WITH_CXX)" = .yes ]; then \ +- echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \ +- $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \ ++ echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/ossp-uuid++.3"; \ ++ $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/ossp-uuid++.3; \ + fi + @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(LIB_NAME) $(DESTDIR)$(libdir)/ + -@if [ ".$(WITH_DCE)" = .yes ]; then \ Property changes on: head/misc/ossp-uuid/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/ossp-uuid/files/patch-uuid.pc.in =================================================================== --- head/misc/ossp-uuid/files/patch-uuid.pc.in (revision 410453) +++ head/misc/ossp-uuid/files/patch-uuid.pc.in (revision 410454) @@ -1,11 +1,11 @@ ---- uuid.pc.in.orig 2012-06-10 21:06:03.000000000 +0300 -+++ uuid.pc.in 2012-06-10 21:06:18.000000000 +0300 +--- uuid.pc.in.orig 2008-03-07 10:49:59 UTC ++++ uuid.pc.in @@ -29,7 +29,7 @@ prefix=@prefix@ exec_prefix=${prefix} -includedir=${prefix}/include +includedir=@includedir@ libdir=${exec_prefix}/lib Name: OSSP uuid Index: head/misc/ossp-uuid/pkg-plist =================================================================== --- head/misc/ossp-uuid/pkg-plist (revision 410453) +++ head/misc/ossp-uuid/pkg-plist (revision 410454) @@ -1,17 +1,17 @@ bin/uuid bin/uuid-config include/ossp/uuid.h include/ossp/uuid++.hh -lib/libuuid.a -lib/libuuid.so -lib/libuuid.so.16 -lib/libuuid.so.16.0.22 -lib/libuuid++.a -lib/libuuid++.so -lib/libuuid++.so.16 -lib/libuuid++.so.16.0.22 -libdata/pkgconfig/uuid.pc +lib/libossp-uuid.a +lib/libossp-uuid.so +lib/libossp-uuid.so.16 +lib/libossp-uuid.so.16.0.22 +lib/libossp-uuid++.a +lib/libossp-uuid++.so +lib/libossp-uuid++.so.16 +lib/libossp-uuid++.so.16.0.22 +libdata/pkgconfig/ossp-uuid.pc man/man1/uuid-config.1.gz man/man1/uuid.1.gz -man/man3/uuid++.3.gz -man/man3/uuid.3.gz +man/man3/ossp-uuid++.3.gz +man/man3/ossp-uuid.3.gz Index: head/misc/p5-OSSP-uuid/Makefile =================================================================== --- head/misc/p5-OSSP-uuid/Makefile (revision 410453) +++ head/misc/p5-OSSP-uuid/Makefile (revision 410454) @@ -1,22 +1,22 @@ # Created by: Frederic Culot # $FreeBSD$ COMMENT= Perl bindings for ossp-uuid -BUILD_DEPENDS= ${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid +BUILD_DEPENDS= ${LOCALBASE}/lib/libossp-uuid.a:${PORTSDIR}/misc/ossp-uuid SLAVEPORT= perl USES= perl5 USE_PERL5= configure MASTERDIR= ${.CURDIR}/../../misc/ossp-uuid WRKSRC= ${WRKDIR}/${DISTNAME}/perl PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr PATCHDIR= ${.CURDIR}/files post-patch: @${REINPLACE_CMD} -e \ 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Makefile.PL .include "${MASTERDIR}/Makefile" Index: head/net/guacamole-server/Makefile =================================================================== --- head/net/guacamole-server/Makefile (revision 410453) +++ head/net/guacamole-server/Makefile (revision 410454) @@ -1,76 +1,76 @@ # Created by: Ultima # $FreeBSD$ PORTNAME= guacamole-server PORTVERSION= 0.9.9 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= ultima1252@gmail.com COMMENT= HTML5 Clientless Remote Desktop LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/ossp-uuid \ +LIB_DEPENDS= libossp-uuid.so:${PORTSDIR}/misc/ossp-uuid \ libpng.so:${PORTSDIR}/graphics/png \ libcairo.so:${PORTSDIR}/graphics/cairo \ libjpeg.so:${PORTSDIR}/graphics/jpeg-turbo -CONFLICTS_BUILD= e2fsprogs-libuuid-* pulseaudio-*+jack_* \ - ffmpeg-*+jack_* +CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_* USE_GITHUB= yes GH_ACCOUNT= glyptodon GH_TAGNAME= ${PORTVERSION} USES= autoreconf libtool localbase pkgconfig shebangfix SHEBANG_FILES= ${WRKSRC}/src/protocols/rdp/keymaps/generate.pl GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-guacd-conf=${PREFIX}/etc/guacd/guacd.conf USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes USERS= guacamole GROUPS= guacamole USE_RC_SUBR= guacd SUB_LIST+= GUACD_USER=${USERS} \ GUACD_GROUP=${GROUPS} OPTIONS_DEFINE= RDP SSH VNC VORBIS PULSEAUDIO OPTIONS_DEFAULT= SSH OPTIONS_SUB= yes PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_DESC?= VNC audio support (Experimental) RDP_LIB_DEPENDS= libfreerdp.so:${PORTSDIR}/net/freerdp RDP_DESC?= RDP Protocal Support SSH_LIB_DEPENDS= libpango-1.0.so:${PORTSDIR}/x11-toolkits/pango \ libssh2.so:${PORTSDIR}/security/libssh2 SSH_DESC?= SSH Support VNC_LIB_DEPENDS= libvncserver.so:${PORTSDIR}/net/libvncserver VNC_DESC?= VNC Protocol Support VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_DESC?= Ogg Vorbis for compression .include post-patch: @${REINPLACE_CMD} 's|/etc/ssl|${PREFIX}/etc/ssl|g ; \ s|/etc/guacamole|${PREFIX}/etc/guacd|g' \ ${WRKSRC}/src/guacd/man/guacd.conf.5 post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac.so.* .if ${PORT_OPTIONS:MSSH} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-ssh.so.* .endif .if ${PORT_OPTIONS:MRDP} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacsnd-client.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacdr-client.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freerdp/guacsvc-client.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-rdp.so.* .endif .if ${PORT_OPTIONS:MVNC} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguac-client-vnc.so.* .endif .include