Attachment #166712 for bug #207004

View | Details | Raw Unified | Return to bug 207004
Collapse All | Expand All

Lines 3-8 Link Here

(-)net/guacamole-server/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= guacamole-server	4	PORTNAME= guacamole-server
5	PORTVERSION= 0.9.9	5	PORTVERSION= 0.9.9
		6	PORTREVISION= 1
6	CATEGORIES= net	7	CATEGORIES= net
7		8
8	MAINTAINER= ultima1252@gmail.com	9	MAINTAINER= ultima1252@gmail.com
Lines 11-17 Link Here
11	LICENSE= MIT	12	LICENSE= MIT
12	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
13		14
14	LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/ossp-uuid \	15	LIB_DEPENDS= libossp-uuid.so:${PORTSDIR}/misc/ossp-uuid \
15	libpng.so:${PORTSDIR}/graphics/png \	16	libpng.so:${PORTSDIR}/graphics/png \
16	libcairo.so:${PORTSDIR}/graphics/cairo \	17	libcairo.so:${PORTSDIR}/graphics/cairo \
17	libjpeg.so:${PORTSDIR}/graphics/jpeg-turbo	18	libjpeg.so:${PORTSDIR}/graphics/jpeg-turbo




# Created by: Matthias Andree <matthias.andree@gmx.de>
# $FreeBSD$

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

Lines 3-9 Link Here

(-)misc/p5-OSSP-uuid/Makefile (-1 / +1 lines)
3		3
4	COMMENT= Perl bindings for ossp-uuid	4	COMMENT= Perl bindings for ossp-uuid
5		5
6	BUILD_DEPENDS= ${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid	6	BUILD_DEPENDS= ${LOCALBASE}/lib/libossp-uuid.a:${PORTSDIR}/misc/ossp-uuid
7		7
8	SLAVEPORT= perl	8	SLAVEPORT= perl
9	USES= perl5	9	USES= perl5





PORTNAME=	uuid
PORTVERSION=	1.6.2
PORTREVISION=	8
CATEGORIES=	misc devel
MASTER_SITES=	OSSP/lib/${PORTNAME}
PKGNAMEPREFIX=	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)




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




bin/uuid-config
include/ossp/uuid.h
include/ossp/uuid++.hh
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/ossp-uuid++.3.gz
man/man3/ossp-uuid.3.gz

Return to bug 207004

Lines 1-14 Link Here

(-)misc/e2fsprogs-libuuid/Makefile (-3 / +1 lines)
1	# Created by: Matthias Andree <matthias.andree@gmx.de>	1	# Created by: Matthias Andree <matthias.andree@gmx.de>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 0	4	PORTREVISION= 1
5	CATEGORIES= misc devel	5	CATEGORIES= misc devel
6	PKGNAMESUFFIX= -libuuid	6	PKGNAMESUFFIX= -libuuid
7		7
8	COMMENT= UUID library from e2fsprogs package	8	COMMENT= UUID library from e2fsprogs package
9		9
10	CONFLICTS= ossp-uuid-[0-9]*
11
12	CONFIGURE_ARGS= --enable-elf-shlibs	10	CONFIGURE_ARGS= --enable-elf-shlibs
13		11
14	OPTIONS_EXCLUDE= NLS	12	OPTIONS_EXCLUDE= NLS

Lines 3-9 Link Here

(-)misc/ossp-uuid/Makefile (-3 / +6 lines)
3		3
4	PORTNAME= uuid	4	PORTNAME= uuid
5	PORTVERSION= 1.6.2	5	PORTVERSION= 1.6.2
6	PORTREVISION= 7	6	PORTREVISION= 8
7	CATEGORIES= misc devel	7	CATEGORIES= misc devel
8	MASTER_SITES= OSSP/lib/${PORTNAME}	8	MASTER_SITES= OSSP/lib/${PORTNAME}
9	PKGNAMEPREFIX= ossp-	9	PKGNAMEPREFIX= ossp-
Lines 19-30 Link Here
19		19
20	.if defined(SLAVEPORT) && ${SLAVEPORT}=="perl"	20	.if defined(SLAVEPORT) && ${SLAVEPORT}=="perl"
21	PKGNAMEPREFIX= p5-OSSP-	21	PKGNAMEPREFIX= p5-OSSP-
22	.else
23	CONFLICTS= e2fsprogs-libuuid-[0-9]*
24	.endif	22	.endif
25		23
26	regression-test: test	24	regression-test: test
27		25
		26	pre-patch:
		27	### Fixes lib conflicts with misc/e2fsprogs-libuuid ###
		28	${REINPLACE_CMD} 's/libuuid.la/libossp-uuid.la/ ; s/libuuid++.la/libossp-uuid++.la/' \
		29	${WRKDIR}/${DISTNAME}/Makefile.in
		30
28	test: build	31	test: build
29	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \	32	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
30	${MAKEFILE} ${MAKE_ARGS} check)	33	${MAKEFILE} ${MAKE_ARGS} check)

Line 0 Link Here

(-)misc/ossp-uuid/files/patch-Makefile.in (+35 lines)
	1	### This Patch is to fix conflicts with misc/e2fsprogs-libuuid ###
	2	--- Makefile.in.orig 2016-02-07 14:59:23 UTC
	3	+++ Makefile.in
	4	@@ -74,7 +74,7 @@ CXX_OBJS = uuid++.lo $(LIB_OBJS)
	5	PRG_NAME = uuid
	6	PRG_OBJS = uuid_cli.o
	7
	8	-MAN_NAME = uuid.3 uuid++.3 uuid.1
	9	+MAN_NAME = ossp-uuid.3 ossp-uuid++.3 uuid.1
	10
	11	PERL_NAME = $(S)/perl/blib/lib/OSSP/uuid.pm
	12	PERL_OBJS = $(S)/perl/uuid.pm
	13	@@ -231,7 +231,7 @@ install:
	14	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
	15	$(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
	16	$(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
	17	- $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/
	18	+ $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/ossp-uuid.pc
	19	$(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
	20	-@if [ ".$(WITH_DCE)" = .yes ]; then \
	21	echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
	22	@@ -241,10 +241,10 @@ install:
	23	echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \
	24	$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
	25	fi
	26	- $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
	27	+ $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3
	28	-@if [ ".$(WITH_CXX)" = .yes ]; then \
	29	- echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
	30	- $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
	31	+ echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/ossp-uuid++.3"; \
	32	+ $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/ossp-uuid++.3; \
	33	fi
	34	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(LIB_NAME) $(DESTDIR)$(libdir)/
	35	-@if [ ".$(WITH_DCE)" = .yes ]; then \

Lines 2-17 Link Here

(-)misc/ossp-uuid/pkg-plist (-11 / +11 lines)
2	bin/uuid-config	2	bin/uuid-config
3	include/ossp/uuid.h	3	include/ossp/uuid.h
4	include/ossp/uuid++.hh	4	include/ossp/uuid++.hh
5	lib/libuuid.a	5	lib/libossp-uuid.a
6	lib/libuuid.so	6	lib/libossp-uuid.so
7	lib/libuuid.so.16	7	lib/libossp-uuid.so.16
8	lib/libuuid.so.16.0.22	8	lib/libossp-uuid.so.16.0.22
9	lib/libuuid++.a	9	lib/libossp-uuid++.a
10	lib/libuuid++.so	10	lib/libossp-uuid++.so
11	lib/libuuid++.so.16	11	lib/libossp-uuid++.so.16
12	lib/libuuid++.so.16.0.22	12	lib/libossp-uuid++.so.16.0.22
13	libdata/pkgconfig/uuid.pc	13	libdata/pkgconfig/ossp-uuid.pc
14	man/man1/uuid-config.1.gz	14	man/man1/uuid-config.1.gz
15	man/man1/uuid.1.gz	15	man/man1/uuid.1.gz
16	man/man3/uuid++.3.gz	16	man/man3/ossp-uuid++.3.gz
17	man/man3/uuid.3.gz	17	man/man3/ossp-uuid.3.gz