FreeBSD Bugzilla – Attachment 166712 Details for
Bug 207004
[patch] misc/ossp-uuid: Fix e2fsprogs-libuuid conflict
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch.diff
ossp-uuid.diff (text/plain), 5.64 KB, created by
Ultima
on 2016-02-07 16:48:56 UTC
(
hide
)
Description:
Patch.diff
Filename:
MIME Type:
Creator:
Ultima
Created:
2016-02-07 16:48:56 UTC
Size:
5.64 KB
patch
obsolete
>Index: net/guacamole-server/Makefile >=================================================================== >--- net/guacamole-server/Makefile (revision 408407) >+++ net/guacamole-server/Makefile (working copy) >@@ -3,6 +3,7 @@ > > PORTNAME= guacamole-server > PORTVERSION= 0.9.9 >+PORTREVISION= 1 > CATEGORIES= net > > MAINTAINER= ultima1252@gmail.com >@@ -11,7 +12,7 @@ > 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 >Index: misc/e2fsprogs-libuuid/Makefile >=================================================================== >--- misc/e2fsprogs-libuuid/Makefile (revision 408407) >+++ misc/e2fsprogs-libuuid/Makefile (working copy) >@@ -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 >Index: misc/p5-OSSP-uuid/Makefile >=================================================================== >--- misc/p5-OSSP-uuid/Makefile (revision 408407) >+++ misc/p5-OSSP-uuid/Makefile (working copy) >@@ -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 >Index: misc/ossp-uuid/Makefile >=================================================================== >--- misc/ossp-uuid/Makefile (revision 408407) >+++ misc/ossp-uuid/Makefile (working copy) >@@ -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 @@ > > .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) >Index: misc/ossp-uuid/files/patch-Makefile.in >=================================================================== >--- misc/ossp-uuid/files/patch-Makefile.in (nonexistent) >+++ misc/ossp-uuid/files/patch-Makefile.in (working copy) >@@ -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: 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: misc/ossp-uuid/pkg-plist >=================================================================== >--- misc/ossp-uuid/pkg-plist (revision 408407) >+++ misc/ossp-uuid/pkg-plist (working copy) >@@ -2,16 +2,16 @@ > 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
Ultima1252
:
maintainer-approval?
(
vd
)
Actions:
View
|
Diff
Attachments on
bug 207004
: 166712