Attachment 105793 Details for Bug 146321 – file.diff

[patch] file.diff

file.diff (text/plain), 4.47 KB, created by Anders F Björklund on 2010-05-05 08:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anders F Björklund

Created: 2010-05-05 08:20:01 UTC

Size: 4.47 KB

patch

obsolete

>diff -uNr /usr/ports/misc/ossp-uuid/Makefile ossp-uuid/Makefile
>--- /usr/ports/misc/ossp-uuid/Makefile	2009-07-29 09:34:44.000000000 +0200
>+++ ossp-uuid/Makefile	2010-05-04 22:58:33.000000000 +0200
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	uuid
> PORTVERSION=	1.6.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	misc devel
> MASTER_SITES=	${MASTER_SITE_OSSP}
> MASTER_SITE_SUBDIR=	lib/${PORTNAME}
>diff -uNr /usr/ports/misc/ossp-uuid/files/patch-includedir.diff ossp-uuid/files/patch-includedir.diff
>--- /usr/ports/misc/ossp-uuid/files/patch-includedir.diff	1970-01-01 01:00:00.000000000 +0100
>+++ ossp-uuid/files/patch-includedir.diff	2010-05-04 23:03:37.000000000 +0200
>@@ -0,0 +1,69 @@
>+--- ./Makefile.in.ossp	2010-05-04 22:54:24.000000000 +0200
>++++ ./Makefile.in	2010-05-04 22:57:51.000000000 +0200
>+@@ -225,21 +225,21 @@ check: all
>+ install:
>+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)
>+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
>+-	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)
>++	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)/ossp
>+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)/libdata/pkgconfig
>+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3
>+ 	$(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 uuid.h $(DESTDIR)$(includedir)/
>++	$(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/ossp/
>+ 	-@if [ ".$(WITH_DCE)" = .yes ]; then \
>+-	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
>+-	    $(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/; \
>++	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/ossp/"; \
>++	    $(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/ossp/; \
>+ 	fi
>+ 	-@if [ ".$(WITH_CXX)" = .yes ]; then \
>+-	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \
>+-	    $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
>++	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/ossp/"; \
>++	    $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/ossp/; \
>+ 	fi
>+ 	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
>+ 	-@if [ ".$(WITH_CXX)" = .yes ]; then \
>+@@ -281,14 +281,14 @@ uninstall:
>+ 	    echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \
>+ 	    $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \
>+ 	fi
>+-	-$(RM) $(DESTDIR)$(includedir)/uuid.h
>++	-$(RM) $(DESTDIR)$(includedir)/ossp/uuid.h
>+ 	-@if [ ".$(WITH_DCE)" = .yes ]; then \
>+-	    echo "$(RM) $(DESTDIR)$(includedir)/uuid_dce.h"; \
>+-	    $(RM) $(DESTDIR)$(includedir)/uuid_dce.h; \
>++	    echo "$(RM) $(DESTDIR)$(includedir)/ossp/uuid_dce.h"; \
>++	    $(RM) $(DESTDIR)$(includedir)/ossp/uuid_dce.h; \
>+ 	fi
>+ 	-@if [ ".$(WITH_CXX)" = .yes ]; then \
>+-	    echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \
>+-	    $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \
>++	    echo "$(RM) $(DESTDIR)$(includedir)/ossp/uuid++.hh"; \
>++	    $(RM) $(DESTDIR)$(includedir)/ossp/uuid++.hh; \
>+ 	fi
>+ 	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
>+ 	-$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1
>+@@ -298,6 +298,7 @@ uninstall:
>+ 	-$(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE)
>+ 	-$(RMDIR) $(DESTDIR)$(libdir)/pkgconfig >/dev/null 2>&1 || $(TRUE)
>+ 	-$(RMDIR) $(DESTDIR)$(libdir) >/dev/null 2>&1 || $(TRUE)
>++	-$(RMDIR) $(DESTDIR)$(includedir)/ossp >/dev/null 2>&1 || $(TRUE)
>+ 	-$(RMDIR) $(DESTDIR)$(includedir) >/dev/null 2>&1 || $(TRUE)
>+ 	-$(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE)
>+ 	-$(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE)
>+--- ./uuid.pc.in.ossp	2008-03-07 11:49:59.000000000 +0100
>++++ ./uuid.pc.in	2010-05-04 22:56:07.000000000 +0200
>+@@ -36,7 +36,7 @@
>+ Description: Universally Unique Identifier (UUID) Library
>+ Version: @UUID_VERSION_RAW@
>+ URL: http://www.ossp.org/pkg/lib/uuid/
>+-Cflags: -I${includedir}
>++Cflags: -I${includedir}/ossp
>+ Libs: -L${libdir} -luuid
>+ Libs.private: @LIBS@
>+ 
>diff -uNr /usr/ports/misc/ossp-uuid/pkg-plist ossp-uuid/pkg-plist
>--- /usr/ports/misc/ossp-uuid/pkg-plist	2007-12-12 16:06:11.000000000 +0100
>+++ ossp-uuid/pkg-plist	2010-05-04 22:58:49.000000000 +0200
>@@ -1,7 +1,7 @@
> bin/uuid
> bin/uuid-config
>-include/uuid.h
>-include/uuid++.hh
>+include/ossp/uuid.h
>+include/ossp/uuid++.hh
> lib/libuuid.a
> lib/libuuid++.a
> lib/libuuid++.la

Actions: View | Diff

Attachments on bug 146321: 105793