Attachment 152586 Details for Bug 197234 – Updated Makefile with advice from Jan Beich

[patch] Updated Makefile with advice from Jan Beich

execline-2.0.2.0.diff (text/plain), 5.43 KB, created by Colin Booth on 2015-02-05 15:10:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Booth

Created: 2015-02-05 15:10:49 UTC

Size: 5.43 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 378455)
>+++ Makefile	(working copy)
>@@ -2,46 +2,33 @@
> # $FreeBSD$
> 
> PORTNAME=	execline
>-PORTVERSION=	1.08
>+PORTVERSION=	2.0.2.0
> CATEGORIES=	lang shells
> MASTER_SITES=	http://www.skarnet.org/software/${PORTNAME}/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	colin@heliocat.net
> COMMENT=	Lightweight non-interactive sh(1)-like scripting language
> 
>-BUILD_DEPENDS=	${LOCALBASE}/lib/skalibs/libstddjb.a:${PORTSDIR}/devel/skalibs
>+LICENSE=	ISCL
> 
>-WRKSRC=		${WRKDIR}/admin/${DISTNAME}
>+BUILD_DEPENDS=	skalibs>=2.2.1.0:${PORTSDIR}/devel/skalibs
> 
>-DOCS=		package/CHANGES package/README package/THANKS package/TODO \
>-		doc/*.html
>+USES=		${GMAKE}
> 
>-OPTIONS_DEFINE=	DOCS EXAMPLES
>+DOCS=		AUTHORS COPYING INSTALL README doc/*.html
> 
>+USE_LDCONFIG=yes
>+CONFIGURE_ARGS+=--prefix=${PREFIX} \
>+        --with-default-path=${PREFIX}/bin:/usr/bin:/bin \
>+        --with-lib=${PREFIX}/lib/skalibs \
>+        --with-include=${PREFIX}/include \
>+        --enable-shared
>+
> do-configure:
>-	${ECHO_CMD} "FreeBSD"	> ${WRKSRC}/src/sys/systype
>-	${ECHO_CMD} "${LOCALBASE}/include/skalibs" \
>-		> ${WRKSRC}/conf-compile/import
>-	${ECHO_CMD} "${LOCALBASE}/lib/skalibs" \
>-		>> ${WRKSRC}/conf-compile/import
>-	${REINPLACE_CMD} -e 's|superstrip1|#superstrip1|g' \
>-		${WRKSRC}/conf-compile/conf-stripbins
>-	@${REINPLACE_CMD} 's|gcc|${CC}|; s|-O2.*|${CFLAGS}|' \
>-		${WRKSRC}/conf-compile/conf-cc \
>-		${WRKSRC}/conf-compile/conf-ld
>+	cd ${WRKSRC} && CC=${CC} ./configure ${CONFIGURE_ARGS}
> 
>-do-build:
>-	(cd ${WRKSRC} && package/compile)
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${PREFIX}/bin
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
>-	${INSTALL_DATA} ${WRKSRC}/include/* \
>-		${STAGEDIR}${PREFIX}/include/${PORTNAME}
>-	${INSTALL_DATA} ${WRKSRC}/library/* ${STAGEDIR}${PREFIX}/lib
>-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/etc/* ${STAGEDIR}${EXAMPLESDIR}
>+post-install:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
>+	cd ${WRKSRC} && ${INSTALL_MAN} ${DOCS} ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 378455)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (execline-1.08.tar.gz) = 6b721bfc2d486e64fa5f0309496a80928ca04d44c647df2aba0c8bbc684ea03b
>-SIZE (execline-1.08.tar.gz) = 69685
>+SHA256 (execline-2.0.2.0.tar.gz) = 73aa2db6e253f1821361033028d9b77733b799f93e4d7d477e4230534d7fce32
>+SIZE (execline-2.0.2.0.tar.gz) = 73327
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 378455)
>+++ pkg-plist	(working copy)
>@@ -8,25 +8,28 @@
> bin/elglob
> bin/emptyenv
> bin/exec
>-bin/execline
> bin/execlineb
> bin/exit
> bin/export
>+bin/fdblock
> bin/fdclose
> bin/fdmove
> bin/fdreserve
>-bin/for
>-bin/forbacktick
>+bin/fdswap
>+bin/forbacktickx
> bin/foreground
>+bin/forx
> bin/getpid
> bin/heredoc
> bin/homeof
> bin/if
>+bin/ifelse
>+bin/ifte
> bin/ifthenelse
>-bin/ifte
> bin/import
> bin/importas
>-bin/loopwhile
>+bin/loopwhilex
>+bin/multidefine
> bin/multisubstitute
> bin/pipeline
> bin/piperw
>@@ -37,15 +40,18 @@
> bin/umask
> bin/unexport
> bin/wait
>+include/execline/config.h
> include/execline/execline.h
>-include/execline/exls1.h
>-lib/libexecline.a
>-lib/libexlp.a
>-lib/libexls1.a
>-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
>+lib/execline/libexecline.a
>+lib/libexecline.so
>+lib/libexecline.so.2
>+lib/libexecline.so.2.0
>+lib/libexecline.so.2.0.2
>+lib/libexecline.so.2.0.2.0
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
> %%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/THANKS
>-%%PORTDOCS%%%%DOCSDIR%%/TODO
> %%PORTDOCS%%%%DOCSDIR%%/background.html
> %%PORTDOCS%%%%DOCSDIR%%/backtick.html
> %%PORTDOCS%%%%DOCSDIR%%/cd.html
>@@ -63,29 +69,30 @@
> %%PORTDOCS%%%%DOCSDIR%%/exec.html
> %%PORTDOCS%%%%DOCSDIR%%/execline-shell.html
> %%PORTDOCS%%%%DOCSDIR%%/execline-startup.html
>-%%PORTDOCS%%%%DOCSDIR%%/execline.html
> %%PORTDOCS%%%%DOCSDIR%%/execlineb.html
> %%PORTDOCS%%%%DOCSDIR%%/exit.html
> %%PORTDOCS%%%%DOCSDIR%%/export.html
>+%%PORTDOCS%%%%DOCSDIR%%/fdblock.html
> %%PORTDOCS%%%%DOCSDIR%%/fdclose.html
> %%PORTDOCS%%%%DOCSDIR%%/fdmove.html
> %%PORTDOCS%%%%DOCSDIR%%/fdreserve.html
>-%%PORTDOCS%%%%DOCSDIR%%/for.html
>-%%PORTDOCS%%%%DOCSDIR%%/forbacktick.html
>+%%PORTDOCS%%%%DOCSDIR%%/fdswap.html
>+%%PORTDOCS%%%%DOCSDIR%%/forbacktickx.html
> %%PORTDOCS%%%%DOCSDIR%%/foreground.html
>+%%PORTDOCS%%%%DOCSDIR%%/forx.html
> %%PORTDOCS%%%%DOCSDIR%%/getpid.html
> %%PORTDOCS%%%%DOCSDIR%%/grammar.html
> %%PORTDOCS%%%%DOCSDIR%%/heredoc.html
> %%PORTDOCS%%%%DOCSDIR%%/homeof.html
> %%PORTDOCS%%%%DOCSDIR%%/if.html
>+%%PORTDOCS%%%%DOCSDIR%%/ifelse.html
> %%PORTDOCS%%%%DOCSDIR%%/ifte.html
> %%PORTDOCS%%%%DOCSDIR%%/ifthenelse.html
> %%PORTDOCS%%%%DOCSDIR%%/import.html
> %%PORTDOCS%%%%DOCSDIR%%/importas.html
> %%PORTDOCS%%%%DOCSDIR%%/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/install.html
>-%%PORTDOCS%%%%DOCSDIR%%/libexecline.html
>-%%PORTDOCS%%%%DOCSDIR%%/loopwhile.html
>+%%PORTDOCS%%%%DOCSDIR%%/loopwhilex.html
>+%%PORTDOCS%%%%DOCSDIR%%/multidefine.html
> %%PORTDOCS%%%%DOCSDIR%%/multisubstitute.html
> %%PORTDOCS%%%%DOCSDIR%%/pipeline.html
> %%PORTDOCS%%%%DOCSDIR%%/piperw.html
>@@ -97,5 +104,3 @@
> %%PORTDOCS%%%%DOCSDIR%%/unexport.html
> %%PORTDOCS%%%%DOCSDIR%%/upgrade.html
> %%PORTDOCS%%%%DOCSDIR%%/wait.html
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/execline-shell
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/execline-startup

Actions: View | Diff

Attachments on bug 197234: 152430 | 152586 | 152628