Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Sep 2016 17:59:47 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r421859 - head/devel/ptypes
Message-ID:  <201609111759.u8BHxlii000236@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun Sep 11 17:59:47 2016
New Revision: 421859
URL: https://svnweb.freebsd.org/changeset/ports/421859

Log:
  - Add LICENSE
  - Switch to options helpers
  - Switch to PORTDOCS/PORTEXAMPLES

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

Modified: head/devel/ptypes/Makefile
==============================================================================
--- head/devel/ptypes/Makefile	Sun Sep 11 17:59:25 2016	(r421858)
+++ head/devel/ptypes/Makefile	Sun Sep 11 17:59:47 2016	(r421859)
@@ -9,43 +9,44 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ Portable Types Library
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 SHLIB_VER=	21
 
-USE_LDCONFIG=	yes
-PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
 PTYPES_CFLAGS=	${CFLAGS}
+MAKE_ARGS=	DEBUG_FLAGS="${DEBUG_FLAGS}" PTYPES_CFLAGS="${PTYPES_CFLAGS}"
+PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
 MAKE_JOBS_UNSAFE=	yes
+USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DEBUG OPTIMIZED_CFLAGS DOCS
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DEBUG OPTIMIZED_CFLAGS DOCS EXAMPLES
 
-.if ${PORT_OPTIONS:MDEBUG}
-DEBUG_FLAGS=	"-DDEBUG -g"
-.endif
-.if ${PORT_OPTIONS:MOPTIMIZED}
-PTYPES_CFLAGS+=-O2
-.endif
+DEBUG_VARS=		DEBUG_FLAGS="-DDEBUG -g"
+OPTIMIZED_CFLAGS_VARS=	PTYPES_CFLAGS+="-O2"
 
-MAKE_ARGS+=	DEBUG_FLAGS="${DEBUG_FLAGS}" PTYPES_CFLAGS="${PTYPES_CFLAGS}"
+pre-install:
+	@${RM} -f ${WRKSRC}/include/*.orig
+	@${RM} -f ${WRKSRC}/wshare/*.o ${WRKSRC}/wshare/*.orig
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/include/ptypes
-	${RM} -f ${WRKSRC}/include/*.orig
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/ptypes
 	${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/include/ptypes
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/so/libptypes.so.${SHLIB_VER} \
-		${STAGEDIR}${PREFIX}/lib
-	cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libptypes.so.${SHLIB_VER} libptypes.so
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/so/libptypes.so.${SHLIB_VER} ${STAGEDIR}${PREFIX}/lib
+	${LN} -sf libptypes.so.${SHLIB_VER} ${STAGEDIR}${PREFIX}/lib/libptypes.so
 	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/lib
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/wshare
-	-${RM} -f ${WRKSRC}/wshare/*.o ${WRKSRC}/wshare/*.orig
+
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/wshare
 	${INSTALL_DATA} ${WRKSRC}/wshare/*.* ${STAGEDIR}${EXAMPLESDIR}/wshare
 	${INSTALL_PROGRAM} ${WRKSRC}/wshare/wshare ${STAGEDIR}${EXAMPLESDIR}/wshare
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${WRKSRC}/index.html ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc; ${TAR} cf - *| ${TAR} xf - -C ${STAGEDIR}${DOCSDIR}/doc
-.endif
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "index.html doc" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/devel/ptypes/pkg-plist
==============================================================================
--- head/devel/ptypes/pkg-plist	Sun Sep 11 17:59:25 2016	(r421858)
+++ head/devel/ptypes/pkg-plist	Sun Sep 11 17:59:47 2016	(r421859)
@@ -8,115 +8,3 @@ lib/libptypes.a
 lib/libptypes.so
 lib/libptypes.so.%%SHLIB_VER%%
 lib/libptypesn.a
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/doc/async.examples.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/async.jobqueue.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/async.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/async.message.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/async.msgqueue.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/async.mutex.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/async.rwlock.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/async.semaphore.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/async.thread.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/async.trigger.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/async.utils.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/basic.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/changes.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/compiling.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/criterrors.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/cset.constructors.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/cset.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/cset.manipulation.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/cset.operators.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/deploying.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/freshmeat-logo.png
-%%PORTDOCS%%%%DOCSDIR%%/doc/htsrc.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/include/pasync.h.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/include/pinet.h.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/include/pport.h.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/include/pstreams.h.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/include/ptime.h.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/include/ptypes.h.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/index.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/inet.examples.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/inet.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/inet.ipmessage.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/inet.ipmsgserver.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/inet.ipstmserver.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/inet.ipstream.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/inet.utils.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.textmap.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.tobjlist.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.tpodlist.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.tstrlist.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/portability.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/ref.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/ref.tmpl.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/source-forge-logo.png
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.errors.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.examples.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.infile.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.inmem.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.instm.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.iobase.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.logfile.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.md5.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.namedpipe.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.npserver.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.outfile.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.outmem.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.outstm.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/streams.stdio.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/string.constructors.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/string.conversion.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/string.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/string.manipulation.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/string.operators.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/string.typecasts.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/styles.css
-%%PORTDOCS%%%%DOCSDIR%%/doc/time.calendar.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/time.datetime.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/time.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/time.time.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/title-21.png
-%%PORTDOCS%%%%DOCSDIR%%/doc/unit.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/unknown.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/variant.arrays.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/variant.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/variant.objrefs.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/variant.typecasts.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/variant.utils.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/wshare.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.Darwin
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.FreeBSD
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.HP-UX
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.Linux
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.SunOS
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.common
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/clients.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/clients.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/config.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/config.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/log.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/log.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/mimetable.awk
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/mimetable.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/mod_about.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/mod_file.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/mod_wstat.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/modules.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/modules.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/request.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/request.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/sysutils.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/sysutils.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/urlutils.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/urlutils.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/utils.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/utils.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/wshare
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/wshare.cxx



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609111759.u8BHxlii000236>