sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/guacamole-server, misc/e2fsprogs-libuuid, misc/p5-OSSP-uuid, misc/ossp-uuid

Browse source 
Currently when requiring both ossp-uuid and e2fspogs-libuuid is an
impossibility without the use of a jail. This patch was created to
fix this conflict. The patch includes updating revisions for removal
of CONFLICTS, and change LIBDEPEND change for all affected ports.

The changes on ossp-uuid port includes renaming of the shared/static
libs created, C/C++ manpage, and rename of pkgconfig file.

PR:		207004
Submitted by:	Ultima1252@gmail.com
Approved by:	vd
This commit is contained in:
Kurt Jaeger 2016-03-06 11:48:10 +00:00
parent a6848ff6a3
commit 5b63de467e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=410454
7 changed files with 59 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
misc/e2fsprogs-libuuid/Makefile
View file

@ -1,14 +1,12 @@
# Created by: Matthias Andree <matthias.andree@gmx.de>
# $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

9
misc/ossp-uuid/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= uuid
PORTVERSION= 1.6.2
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= misc devel
MASTER_SITES= OSSP/lib/${PORTNAME}
PKGNAMEPREFIX= ossp-
@ -19,12 +19,15 @@ CONFIGURE_ARGS= --with-cxx \
.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)

35
misc/ossp-uuid/files/patch-Makefile.in Normal file
View file

@ -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 \

4
misc/ossp-uuid/files/patch-uuid.pc.in
View file

@ -1,5 +1,5 @@
--- 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@

22
misc/ossp-uuid/pkg-plist
View file

@ -2,16 +2,16 @@ 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

2
misc/p5-OSSP-uuid/Makefile
View file

@ -3,7 +3,7 @@
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

6
net/guacamole-server/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= guacamole-server
PORTVERSION= 0.9.9
PORTREVISION= 1
CATEGORIES= net
MAINTAINER= ultima1252@gmail.com
@ -11,13 +12,12 @@ 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