Skip site navigation (1)Skip section navigation (2)
Date:      Fri,  7 Aug 2009 22:37:01 -0300 (BRT)
From:      Sylvio Cesar <scjamorim@bsd.com.br>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        scjamorim@bsd.com.br
Subject:   ports/137551: [PATCH] shells/lshell: add of lshell in /etc/shells
Message-ID:  <20090808013701.A954B22A0CD@fbsd72.scjamorim.org>
Resent-Message-ID: <200908080140.n781e3xt003273@freefall.freebsd.org>

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

>Number:         137551
>Category:       ports
>Synopsis:       [PATCH] shells/lshell: add of lshell in /etc/shells
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 08 01:40:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Sylvio Cesar
>Release:        FreeBSD 7.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD fbsd72.scjamorim.org 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Mon Aug  3 22:10:47 BRT
>Description:
- Add of lshell in /etc/shells
- Add file pkg-plist
- Removed file patch-setup.py

You can see log in mine tinderbox:
http://www.scjamorim.org/Home/lshell-0.9.5.log

Added file(s):
- pkg-plist

Removed file(s):
- files/patch-setup.py

Port maintainer (scjamorim@bsd.com.br) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- lshell-0.9.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/shells/lshell/Makefile,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile
--- Makefile	5 Aug 2009 13:09:59 -0000	1.1
+++ Makefile	8 Aug 2009 01:33:14 -0000
@@ -19,22 +19,31 @@
 USE_PYDISTUTILS=	yes
 USE_PYTHON=	yes
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/lshell.py \
-		%%PYTHON_SITELIBDIR%%/lshell.pyc \
-		%%PYTHON_SITELIBDIR%%/lshell.pyo \
-		bin/lshell \
-		etc/lshell.conf
+SHELLS=		/etc/shells
 
 MAN1=	lshell.1
 
-DOCS=	README COPYING CHANGES
+PORTDOCS=	README COPYING CHANGES
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/etc|etc|g' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for f in ${DOCS}
+.for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
 .endfor
 .endif
+	@${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
+	@if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \
+	${INSTALL_DATA} -p ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf ; \
+	fi
+	@${ECHO_MSG} "Updating ${SHELLS}"
+	@${CP} ${SHELLS} ${SHELLS}.bak
+	@(${GREP} -v ${PREFIX}/bin/${PORTNAME} ${SHELLS}.bak; \
+	  ${ECHO_CMD} ${PREFIX}/bin/${PORTNAME}) > ${SHELLS}
+	@${RM} ${SHELLS}.bak
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg-plist	8 Aug 2009 01:33:14 -0000
@@ -0,0 +1,12 @@
+@comment $FreeBSD$
+bin/lshell
+@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
+@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+@unexec if cmp -s %D/etc/lshell.conf %D/etc/lshell.conf.sample; then rm -f %D/etc/lshell.conf; fi
+etc/lshell.conf.sample
+@exec if [ ! -f %D/etc/lshell.conf ]; then cp %B/%f %D/etc/lshell.conf; fi
+%%PYTHON_SITELIBDIR%%/lshell.py
+%%PYTHON_SITELIBDIR%%/lshell.pyc
+%%PYTHON_SITELIBDIR%%/lshell.pyo
+@dirrmtry %%DATADIR%%
+@dirrmtry %%LOGDIR%%
Index: files/patch-setup.py
===================================================================
RCS file: files/patch-setup.py
diff -N files/patch-setup.py
--- files/patch-setup.py	5 Aug 2009 13:10:00 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- setup.py	2009-07-28 15:20:50.000000000 -0300
-+++ patch-setup.py	2009-08-05 08:41:06.000000000 -0300
-@@ -40,9 +40,8 @@
-         scripts = ['bin/lshell'],
-         package_dir = {'':'lshellmodule'},
-         packages = [''],
--        data_files = [('/etc', ['etc/lshell.conf']),
--            ('share/doc/lshell',['README', 'COPYING', 'CHANGES']),
--            ('share/man/man1/', ['man/lshell.1']) ],
-+        data_files = [('etc', ['etc/lshell.conf']),
-+            ('man/man1/', ['man/lshell.1']) ],
-         classifiers=[
-                 'Development Status :: 4 - Beta',
-                 'Environment :: Console'
--- lshell-0.9.5.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?20090808013701.A954B22A0CD>