Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 02 Nov 2013 22:17:57 +0100
From:      nemysis <nemysis@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        garga@FreeBSD.org
Subject:   ports/183600: [PATCH] devel/libslang2: Fix install, add proper DOCS
Message-ID:  <201311022117.rA2LHvjq000662@freefall.freebsd.org>
Resent-Message-ID: <201311022120.rA2LK0WB000797@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         183600
>Category:       ports
>Synopsis:       [PATCH] devel/libslang2: Fix install, add proper DOCS
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 02 21:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.2-RELEASE-p8 amd64
>Organization:
>Environment:
System: FreeBSD nemysis4now 9.2-RELEASE-p8 FreeBSD 9.2-RELEASE-p8 #0: Mon Sep 23 16:26:45 UTC 2013
>Description:

- Fix install
- Remove DOCS from default Options
- Add proper DOCS

Port maintainer (garga@FreeBSD.org) is cc'd.

Generated and tested manually, tested with stage and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:

Build log

https://redports.org/buildarchive/20131102205700-33334/

Before this patch

https://redports.org/~nemysis/20131102200600-33857-156813/libslang2-2.2.4_4.log

https://redports.org/~nemysis/20131102200600-33857-156811/libslang2-2.2.4_4.log

>Fix:

--- libslang2-2.2.4_4.patch begins here ---
diff -ruN /usr/ports/devel/libslang2/Makefile ./Makefile
--- /usr/ports/devel/libslang2/Makefile	2013-11-01 13:07:52.000000000 +0100
+++ ./Makefile	2013-11-02 21:53:29.000000000 +0100
@@ -31,13 +31,20 @@
 DATADIR=	${PREFIX}/share/slsh
 
 OPTIONS_DEFINE=	PCRE PNG ICONV ONIG DOCS
-OPTIONS_DEFAULT=PCRE PNG ICONV DOCS
+OPTIONS_DEFAULT=PCRE PNG ICONV
 OPTIONS_SUB=	yes
 
 ONIG_DESC=	Oniguruma support
 
 PORTDOCS=	*
 
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	NEWS changes.txt
+
+DOCSRCDIR2=	${WRKSRC}/doc
+DOCSDIR2=	${DOCSDIR}/doc
+DOC_FILES2=	*
+
 PCRE_CONFIGURE_WITH=	pcre
 PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 PNG_CONFIGURE_WITH=	png
@@ -54,4 +61,10 @@
 		${WRKSRC}/src/Makefile.in \
 		${WRKSRC}/slsh/Makefile.in
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR2})
+
 .include <bsd.port.mk>
--- libslang2-2.2.4_4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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