svn commit: r356559 - in head/devel/libowfat: . files

[David Thiel]

Author: lx
Date: Thu Jun  5 00:44:00 2014
New Revision: 356559
URL: http://svnweb.freebsd.org/changeset/ports/356559
QAT: https://qat.redports.org/buildarchive/r356559/

Log:
  Stage-ify.

Modified:
  head/devel/libowfat/Makefile
  head/devel/libowfat/files/manpages
  head/devel/libowfat/files/patch-GNUmakefile

Modified: head/devel/libowfat/Makefile
==============================================================================
--- head/devel/libowfat/Makefile	Thu Jun  5 00:12:09 2014	(r356558)
+++ head/devel/libowfat/Makefile	Thu Jun  5 00:44:00 2014	(r356559)
@@ -17,42 +17,26 @@ MAKEFILE=	GNUmakefile
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 MAKE_ENV+=	INSTALL="${INSTALL}"
 
+.include "${FILESDIR}/manpages"
+
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O2 -fomit-frame-pointer
 .endif
 
-.include "${FILESDIR}/manpages"
-
-include=	array.h buffer.h byte.h case.h cdb.h cdb_make.h dns.h errmsg.h \
-		fmt.h havealloca.h io.h iob.h iopause.h ip4.h ip6.h iarray.h \
-		isset.h mmap.h ndelay.h open.h openreadclose.h rangecheck.h \
-		readclose.h safemult.h scan.h socket.h str.h stralloc.h tai.h \
-		taia.h textcode.h uint16.h uint32.h uint64.h va_narg.h
-
-PLIST_DIRS=	include/libowfat
-PLIST_FILES=	${include:S,^,include/libowfat/,} lib/libowfat.a
-PORTDOCS=	CHANGES README TODO
-
 post-extract:
 	@${MKDIR} ${WRKSRC}/man
 # Manual pages clash with other programs; prepend libowfat_ to them.
-.for i in ${MAN3}
+.for i in ${MANPAGES}
 	@${MV} ${WRKSRC}/*/${i:S/libowfat_//} ${WRKSRC}/man/${i}
 .endfor
 
 post-patch:
 # Clang cries when void functions return a value
 	${REINPLACE_CMD} -e '56s|return ||' ${WRKSRC}/CAS.h
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+	${REINPLACE_CMD} -e "s|STAGEDIR|${STAGEDIR}|g" ${WRKSRC}/GNUmakefile
 
 .include <bsd.port.post.mk>

Modified: head/devel/libowfat/files/manpages
==============================================================================
--- head/devel/libowfat/files/manpages	Thu Jun  5 00:12:09 2014	(r356558)
+++ head/devel/libowfat/files/manpages	Thu Jun  5 00:44:00 2014	(r356559)
@@ -1,4 +1,4 @@
-MAN3=\
+MANPAGES=\
 libowfat_array.3 \
 libowfat_array_allocate.3 \
 libowfat_array_bytes.3 \

Modified: head/devel/libowfat/files/patch-GNUmakefile
==============================================================================
--- head/devel/libowfat/files/patch-GNUmakefile	Thu Jun  5 00:12:09 2014	(r356558)
+++ head/devel/libowfat/files/patch-GNUmakefile	Thu Jun  5 00:44:00 2014	(r356559)
@@ -1,16 +1,16 @@
---- GNUmakefile.orig	2012-12-07 13:56:58.228489366 -0800
-+++ GNUmakefile	2012-12-07 14:03:23.455485788 -0800
+--- GNUmakefile.orig	2012-04-17 14:26:31.000000000 -0700
++++ GNUmakefile	2014-06-04 17:26:54.000000000 -0700
 @@ -4,10 +4,10 @@
  # in /opt/diet, where they are in the default search path for my diet libc
  # work but don't conflict with anything there.  YMMV.
  
 -prefix=/opt/diet
-+prefix=${PREFIX}
++prefix=STAGEDIR${PREFIX}
  LIBDIR=${prefix}/lib
 -INCLUDEDIR=${prefix}/include
 -MAN3DIR=${prefix}/man/man3
 +INCLUDEDIR=${prefix}/include/libowfat
-+MAN3DIR=${MANPREFIX}/man/man3
++MAN3DIR=STAGEDIR${MANPREFIX}/man/man3
  
  LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \
  buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a \