aboutsummaryrefslogtreecommitdiff
path: root/misc/ossp-uuid
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2014-08-16 15:04:45 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2014-08-16 15:04:45 +0000
commita44b2f459f974432796d7a458b2b02d8c476a924 (patch)
tree0d09c4f17f1ef0041bb594a189d339b1269d7c3f /misc/ossp-uuid
parent73c3d661b13cdad3b11f0f64d0442056076167ba (diff)
downloadports-a44b2f459f974432796d7a458b2b02d8c476a924.tar.gz
ports-a44b2f459f974432796d7a458b2b02d8c476a924.zip
- USES=libtool pathfix
- Use MAKE_CMD
Notes
Notes: svn path=/head/; revision=365087
Diffstat (limited to 'misc/ossp-uuid')
-rw-r--r--misc/ossp-uuid/Makefile16
-rw-r--r--misc/ossp-uuid/files/patch-Makefile.in26
-rw-r--r--misc/ossp-uuid/pkg-plist7
3 files changed, 12 insertions, 37 deletions
diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index c663b5b97d08..e5ba8b1ab2c9 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uuid
PORTVERSION= 1.6.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= misc devel
MASTER_SITES= ${MASTER_SITE_OSSP}
MASTER_SITE_SUBDIR= lib/${PORTNAME}
@@ -13,8 +13,9 @@ 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= --disable-shared --enable-static --with-cxx \
+CONFIGURE_ARGS= --with-cxx \
--includedir=${PREFIX}/include/ossp
.if defined(SLAVEPORT) && ${SLAVEPORT}=="perl"
@@ -23,15 +24,10 @@ PKGNAMEPREFIX= p5-OSSP-
CONFLICTS= e2fsprogs-libuuid-[0-9]*
.endif
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+= -fPIC -DPIC
-.endif
-
regression-test: test
test: build
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check
+ @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${MAKE_ARGS} check)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/ossp-uuid/files/patch-Makefile.in b/misc/ossp-uuid/files/patch-Makefile.in
deleted file mode 100644
index 0085c6be4bd6..000000000000
--- a/misc/ossp-uuid/files/patch-Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.in.orig 2008-02-21 09:56:57.000000000 +0200
-+++ Makefile.in 2008-05-30 13:28:33.000000000 +0300
-@@ -62,7 +62,7 @@
- PHP = @PHP@
- PG_CONFIG = @PG_CONFIG@
-
--LIB_NAME = libuuid.la
-+LIB_NAME = libuuid.a
- LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
-
- DCE_NAME = libuuid_dce.la
-@@ -226,12 +226,12 @@
- $(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)$(libdir)/pkgconfig
-+ $(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)$(libdir)/pkgconfig/
-+ $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/
- $(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)/"; \
diff --git a/misc/ossp-uuid/pkg-plist b/misc/ossp-uuid/pkg-plist
index 46dca7ac304a..6aeb3818feaf 100644
--- a/misc/ossp-uuid/pkg-plist
+++ b/misc/ossp-uuid/pkg-plist
@@ -3,8 +3,13 @@ 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++.la
+lib/libuuid++.so
+lib/libuuid++.so.16
+lib/libuuid++.so.16.0.22
libdata/pkgconfig/uuid.pc
man/man1/uuid-config.1.gz
man/man1/uuid.1.gz