svn commit: r346717 - head/devel/fib

[John Marino]

Author: marino
Date: Sat Mar  1 19:53:44 2014
New Revision: 346717
URL: http://svnweb.freebsd.org/changeset/ports/346717
QAT: https://qat.redports.org/buildarchive/r346717/

Log:
  devel/fib: Honor NO_PROFILE, fix staging and override install target
  
  This port was building and installing the profile library regardless of
  the NO_PROFILE definition.  The installation was a bit of a mess too, and
  it didn't use the BSD_INSTALL_* values.  The previous staging attempt
  didn't work, at least not on DragonFly, so let's use our own install
  target to fix all of these issues and honor the NO_PROFILE request
  at the same time.

Modified:
  head/devel/fib/Makefile
  head/devel/fib/pkg-plist

Modified: head/devel/fib/Makefile
==============================================================================
--- head/devel/fib/Makefile	Sat Mar  1 19:40:09 2014	(r346716)
+++ head/devel/fib/Makefile	Sat Mar  1 19:53:44 2014	(r346717)
@@ -3,6 +3,7 @@
 
 PORTNAME=	fib
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://resnet.uoregon.edu/~gurney_j/jmpc/dist/
 
@@ -11,14 +12,28 @@ COMMENT=	Fibonacci Heap Library
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+ALL_TARGET=	libfib.a libfib.so.1
+STATIC_INST=	libfib.a
 
 MANPAGES=	fh_extractmin.3 fh_makeheap.3 fh_makekeyheap.3
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfib.so.1
+.include <bsd.port.pre.mk>
+
+.if defined(NO_PROFILE) || ${OPSYS} == DragonFly
+PLIST_SUB+=	PROFILE="@comment "
+.else
+ALL_TARGET+=	libfib_p.a
+STATIC_INST+=	libfib_p.a
+PLIST_SUB+=	PROFILE=""
+.endif
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/fib.h ${STAGEDIR}${PREFIX}/include/
+	${INSTALL_LIB} ${WRKSRC}/libfib.so.1 ${STAGEDIR}${PREFIX}/lib/
 	@(cd ${STAGEDIR}${PREFIX}/lib/; ${LN} -sf libfib.so.1 libfib.so)
-.for mf in ${MANPAGES}
-	${INSTALL_MAN} ${WRKSRC}/${mf} ${STAGEDIR}${PREFIX}/man/man3/
-.endfor
+	@(cd ${WRKSRC}; ${INSTALL_DATA} ${STATIC_INST} \
+		${STAGEDIR}${PREFIX}/lib/)
+	@(cd ${WRKSRC}; ${INSTALL_MAN} ${MANPAGES} \
+		${STAGEDIR}${PREFIX}/man/man3/)
 
 .include <bsd.port.mk>

Modified: head/devel/fib/pkg-plist
==============================================================================
--- head/devel/fib/pkg-plist	Sat Mar  1 19:40:09 2014	(r346716)
+++ head/devel/fib/pkg-plist	Sat Mar  1 19:53:44 2014	(r346717)
@@ -2,7 +2,7 @@ include/fib.h
 lib/libfib.a
 lib/libfib.so
 lib/libfib.so.1
-lib/libfib_p.a
+%%PROFILE%%lib/libfib_p.a
 man/man3/fh_extractmin.3.gz
 man/man3/fh_makeheap.3.gz
 man/man3/fh_makekeyheap.3.gz