Date: Wed, 9 Aug 2006 21:00:39 +0600 (YEKST) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: araujobsd@gmail.com Subject: ports/101717: [PATCH] mail/ask: update to 2.5.3, bugfixes, install manpages, cleanup, etc Message-ID: <20060809150039.9C03512C62@fonon.realnet> Resent-Message-ID: <200608091710.k79HA8OP034608@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101717
>Category: ports
>Synopsis: [PATCH] mail/ask: update to 2.5.3, bugfixes, install manpages, cleanup, etc
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 09 17:10:08 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Stanislav Sedov
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Wed Aug 2 21:44:37 MSD
>Description:
- Update to 2.5.3
- Install manpages appropiately
- Garantee correct permissions by using INSTALL
- Fix script headers and dir location to allow ASK to find it's
libs/configuration files.
- Add pkg-message to point user to setup information
- Install documentation with correct permissions
- Install util/asksenders script to bin directory, fix it also for
library paths/python path.
The following files was added:
- files/pkg-message.in
Copy of this message was sent to (araujobsd@gmail.com).
>How-To-Repeat:
>Fix:
--- ask-2.5.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/ask/Makefile /var/tmp/ruby/ask/Makefile
--- /usr/ports/mail/ask/Makefile Mon Nov 28 03:09:52 2005
+++ /var/tmp/ruby/ask/Makefile Wed Aug 9 20:59:19 2006
@@ -6,7 +6,7 @@
#
PORTNAME= ask
-PORTVERSION= 2.5.0
+PORTVERSION= 2.5.3
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= a-s-k
@@ -17,33 +17,38 @@
USE_PYTHON= yes
NO_BUILD= yes
-PLIST_SUB= VER=${PORTVERSION}
+ASKLIBDIR= ${PREFIX}/lib/${PORTNAME}
+BINS= askfilter asksetup utils/asksenders
+MAN1= askfilter.1 asksenders.1 asksetup.1
+SUB_FILES= pkg-message
+
+.if !defined(NOPORTDOCS)
+PORTDOCS= *
+.endif
+
+post-extract:
+ @${REINPLACE_CMD} -E \
+ -e "s,/usr/share/ask/templates,${EXAMPLESDIR},g" \
+ -e "s,/usr/lib/ask,${ASKLIBDIR},g" \
+ -e "s,^(#!)/usr/bin/python,\1${PYTHON_CMD}," \
+ ${BINS:S,^,${WRKSRC}/,} ${WRKSRC}/*.py
do-install:
- ${MKDIR} ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/COPYING ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/ChangeLog ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/TODO ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/ask.py ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/askconfig.py ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/ask-${PORTVERSION}-1.spec ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/asklock.py ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/asklog.py ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/askmail.py ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/askmain.py ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/askmessage.py ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/askremote.py ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/asksetup.py ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/askversion.py ${PREFIX}/ask
- ${INSTALL_SCRIPT} ${WRKSRC}/test.py ${PREFIX}/ask
- ${CP} -R ${WRKSRC}/samples ${PREFIX}/ask
- ${CP} -R ${WRKSRC}/templates ${PREFIX}/ask
+ ${MKDIR} ${ASKLIBDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.py ${ASKLIBDIR}
+ ${INSTALL_SCRIPT} ${BINS:S,^,${WRKSRC}/,} ${PREFIX}/bin
+
+ ${MKDIR} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/templates/* ${EXAMPLESDIR}
+
+ ${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/docs/,} ${PREFIX}/man/man1
-post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
- ${CP} -R ${WRKSRC}/docs ${DOCSDIR}
- ${CP} -R ${WRKSRC}/utils ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/*.[!1]* ${DOCSDIR}
.endif
+
+post-install:
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/mail/ask/distinfo /var/tmp/ruby/ask/distinfo
--- /usr/ports/mail/ask/distinfo Mon Nov 28 03:09:52 2005
+++ /var/tmp/ruby/ask/distinfo Wed Aug 9 17:14:41 2006
@@ -1,3 +1,3 @@
-MD5 (ask-2.5.0.tar.gz) = 5f5616f3bbdb218768d78598f243921d
-SHA256 (ask-2.5.0.tar.gz) = aefb465d50471e208b8d932a88c6f9e88bcc4213930145b12aa529c83322ebbf
-SIZE (ask-2.5.0.tar.gz) = 105324
+MD5 (ask-2.5.3.tar.gz) = 491ce48168d70365d7480a6d3c28f87d
+SHA256 (ask-2.5.3.tar.gz) = f5f90d9006f655673104d45f803a6e7e1f9baba708a51510cf16e5e753183f15
+SIZE (ask-2.5.3.tar.gz) = 106339
diff -ruN --exclude=CVS /usr/ports/mail/ask/files/pkg-message.in /var/tmp/ruby/ask/files/pkg-message.in
--- /usr/ports/mail/ask/files/pkg-message.in Thu Jan 1 05:00:00 1970
+++ /var/tmp/ruby/ask/files/pkg-message.in Wed Aug 9 20:41:01 2006
@@ -0,0 +1,13 @@
+=============================================================================
+
+Sample configuration files were installed in
+%%EXAMPLESDIR%%
+
+To use ASK copy them into ~/.ask directory and edit in way you like.
+
+For additional information see supplied documentation in
+%%DOCSDIR%%
+
+and/or manpages: askfilter(1) asksenders(1) asksetup(1)
+
+=============================================================================
diff -ruN --exclude=CVS /usr/ports/mail/ask/pkg-plist /var/tmp/ruby/ask/pkg-plist
--- /usr/ports/mail/ask/pkg-plist Mon Nov 28 03:09:52 2005
+++ /var/tmp/ruby/ask/pkg-plist Wed Aug 9 20:42:14 2006
@@ -1,52 +1,26 @@
-ask/COPYING
-ask/ChangeLog
-ask/TODO
-ask/ask.py
-ask/askconfig.py
-ask/ask-%%VER%%-1.spec
-ask/asklock.py
-ask/asklog.py
-ask/askmail.py
-ask/askmain.py
-ask/askmessage.py
-ask/askremote.py
-ask/asksetup.py
-ask/askversion.py
-ask/test.py
-ask/templates/blacklist_da.txt
-ask/templates/blacklist_de.txt
-ask/templates/blacklist_en.txt
-ask/templates/blacklist_es.txt
-ask/templates/blacklist_fr.txt
-ask/templates/blacklist_it.txt
-ask/templates/blacklist_nl.txt
-ask/templates/blacklist_ptbr.txt
-ask/templates/blacklist_fi.txt
-ask/templates/confirm_da.txt
-ask/templates/confirm_de.txt
-ask/templates/confirm_en.txt
-ask/templates/confirm_es.txt
-ask/templates/confirm_fi.txt
-ask/templates/confirm_fr.txt
-ask/templates/confirm_it.txt
-ask/templates/confirm_nl.txt
-ask/templates/confirm_ptbr.txt
-%%PORTDOCS%%%%DOCSDIR%%/utils/asksenders.py
-%%PORTDOCS%%%%DOCSDIR%%/docs/ask.py.1
-%%PORTDOCS%%%%DOCSDIR%%/docs/ask_doc.css
-%%PORTDOCS%%%%DOCSDIR%%/docs/ask_doc.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/ask_doc.pdf
-%%PORTDOCS%%%%DOCSDIR%%/docs/ask_doc.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/asksenders.py.1
-%%PORTDOCS%%%%DOCSDIR%%/docs/asksetup.py.1
-%%PORTDOCS%%%%DOCSDIR%%/docs/askversion.py.1
-ask/samples/blacklist.txt
-ask/samples/ignorelist.txt
-ask/samples/sample_askrc
-ask/samples/whitelist.txt
-@dirrm %%DOCSDIR%%/docs
-@dirrm %%DOCSDIR%%/utils
-@dirrm %%DOCSDIR%%
-@dirrm ask/samples
-@dirrm ask/templates
-@dirrm ask
+bin/askfilter
+bin/asksenders
+bin/asksetup
+lib/ask/askconfig.py
+lib/ask/asklock.py
+lib/ask/asklog.py
+lib/ask/askmail.py
+lib/ask/askmain.py
+lib/ask/askmessage.py
+lib/ask/askremote.py
+lib/ask/askversion.py
+lib/ask/test.py
+%%EXAMPLESDIR%%/ask.rc
+%%EXAMPLESDIR%%/confirm_da.txt
+%%EXAMPLESDIR%%/confirm_de.txt
+%%EXAMPLESDIR%%/confirm_en.txt
+%%EXAMPLESDIR%%/confirm_es.txt
+%%EXAMPLESDIR%%/confirm_fi.txt
+%%EXAMPLESDIR%%/confirm_fr.txt
+%%EXAMPLESDIR%%/confirm_it.txt
+%%EXAMPLESDIR%%/confirm_nl.txt
+%%EXAMPLESDIR%%/confirm_ptbr.txt
+%%EXAMPLESDIR%%/ignorelist.txt
+%%EXAMPLESDIR%%/whitelist.txt
+@dirrm %%EXAMPLESDIR%%
+@dirrm lib/ask
--- ask-2.5.3.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?20060809150039.9C03512C62>