Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Feb 2021 03:25:21 +0000 (UTC)
From:      Mikhail Teterin <mi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r565478 - head/lang/siod
Message-ID:  <202102170325.11H3PLl0043361@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mi
Date: Wed Feb 17 03:25:20 2021
New Revision: 565478
URL: https://svnweb.freebsd.org/changeset/ports/565478

Log:
  List ${PREFIX}/lib in addition to ${PREFIX}/lib/siod for ldconfig.
  
  Add the DOCS option -- and deal with the siod.html file depending
  on the selection.
  
  Sponsored by:	United Marsupials

Modified:
  head/lang/siod/Makefile
  head/lang/siod/pkg-plist

Modified: head/lang/siod/Makefile
==============================================================================
--- head/lang/siod/Makefile	Wed Feb 17 03:00:00 2021	(r565477)
+++ head/lang/siod/Makefile	Wed Feb 17 03:25:20 2021	(r565478)
@@ -15,10 +15,10 @@ LICENSE=	LGPL21	# Declared inside slib.c
 
 USES=		uidfix tar:tgz dos2unix
 
-USE_LDCONFIG=	${PREFIX}/lib/siod
+USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/siod
 
 DOS2UNIX_FILES=	sql_oracle.c ss.c
-OPTIONS_DEFINE=	SQL_SYBASE GD NDBM REGEX SS
+OPTIONS_DEFINE=	SQL_SYBASE GD NDBM REGEX SS DOCS
 OPTIONS_DEFAULT=NDBM REGEX SS
 SQL_SYBASE_DESC=Build Sybase (and MS-SQL) client-module (using FreeTDS)
 SS_DESC=	Sockets support - required for any network programs
@@ -51,7 +51,7 @@ post-build:
 	${MAKE} -C ${WRKSRC} -f makefile build_driver
 
 .include <bsd.port.options.mk>
-MODULES+=	${SELECTED_OPTIONS:tl}
+MODULES+=	${SELECTED_OPTIONS:NDOCS:tl}
 
 do-configure:
 	${MKDIR} ${WRKSRC}/lib
@@ -66,5 +66,12 @@ do-configure:
 	${SED} "s,%%PROG%%,$s,g" ${FILESDIR}/BSDmakefile.prog >	\
 	    ${WRKSRC}/$s/BSDmakefile
 .endfor
+
+post-install-DOCS-off:
+	${RM} ${STAGEDIR}${PREFIX}/lib/siod/siod.html
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MV} ${STAGEDIR}${PREFIX}/lib/siod/siod.html ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Modified: head/lang/siod/pkg-plist
==============================================================================
--- head/lang/siod/pkg-plist	Wed Feb 17 03:00:00 2021	(r565477)
+++ head/lang/siod/pkg-plist	Wed Feb 17 03:25:20 2021	(r565478)
@@ -28,7 +28,7 @@ lib/siod/parser_pratt.scm
 lib/siod/pop3.scm
 lib/siod/selfdoc.scm
 lib/siod/sample.c
-lib/siod/siod.html
+%%PORTDOCS%%%%DOCSDIR%%/siod.html
 lib/siod/piechart.scm
 lib/siod/cgi.scm
 lib/siod/ftp.scm



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