Date: Sat, 15 Apr 2006 00:52:49 -0700 (PDT) From: "infofarmer @ gmail. com" <infofarmer@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/95794: update textproc/archmage to 0.0.7 Message-ID: <4440a651.13823be8.29ca.6383@mx.gmail.com> Resent-Message-ID: <200604150800.k3F80XYc030582@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95794
>Category: ports
>Synopsis: update textproc/archmage to 0.0.7
>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: Sat Apr 15 08:00:32 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Andrew Pantyukhin
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD sat64.net17 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #14: Sun Mar 5 15:57:19 MSK 2006 sat@sat64.net17:/usr/obj/usr/src/sys/SATCUR32 i386
>Description:
Update to 0.0.7
Offer adoption
>How-To-Repeat:
>Fix:
--- archmage.diff begins here ---
diff -urN /usr/ports/textproc/archmage/Makefile archmage/Makefile
--- /usr/ports/textproc/archmage/Makefile Fri Apr 14 22:14:58 2006
+++ archmage/Makefile Sat Apr 15 11:49:08 2006
@@ -1,40 +1,28 @@
# New ports collection makefile for: archmage
-# Date created: 22 February 2005
-# Whom: Vsevolod Stakhov <vsevolod@highsecure.ru>
+# Date created: 22 February 2005
+# Whom: Vsevolod Stakhov <vsevolod@highsecure.ru>
#
# $FreeBSD: ports/textproc/archmage/Makefile,v 1.6 2006/04/14 18:14:58 linimon Exp $
#
PORTNAME= archmage
-PORTVERSION= 0.0.6
-PORTREVISION= 1
+PORTVERSION= 0.0.7
CATEGORIES= textproc python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= archmage
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Extensible reader/decompiler of files in CHM format
-LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chmlib
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/chm/chm.py:${PORTSDIR}/textproc/pychm
NO_BUILD= yes
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-PYDISTUTILS_INSTALLARGS= build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib \
- install -c -O1 --prefix=${PREFIX}
-USE_REINPLACE= yes
post-patch:
@${REINPLACE_CMD} -e "s,/usr/share,${PREFIX}/share," ${WRKSRC}/arch.conf
- @${REINPLACE_CMD} -e "s,/etc/arch\.conf,${PREFIX}/etc/arch\.conf," ${WRKSRC}/CHM.py
- @${MV} ${WRKSRC}/archmage ${WRKSRC}/archmage.orig
- @${MKDIR} ${WRKSRC}/archmage
- @${MV} ${WRKSRC}/archmage.orig ${WRKSRC}/archmage/archmage
- @${LN} -s ${WRKSRC}/chmlib/chmlib.py ${WRKSRC}/archmage/
- @${MV} ${WRKSRC}/CHM.py ${WRKSRC}/archmage/
- @${MV} ${WRKSRC}/mod_chm.py ${WRKSRC}/archmage/
-
-post-install:
- @${ECHO} "archmage" > ${PYTHON_SITELIBDIR}/archmage.pth
+ @${REINPLACE_CMD} -e "s,/etc,${PREFIX}/etc," ${WRKSRC}/archmod/CHM.py
+ @${REINPLACE_CMD} -e "s,/etc,etc," ${WRKSRC}/setup.py
.include <bsd.port.mk>
diff -urN /usr/ports/textproc/archmage/distinfo archmage/distinfo
--- /usr/ports/textproc/archmage/distinfo Tue Jan 24 06:09:29 2006
+++ archmage/distinfo Sat Apr 15 11:12:23 2006
@@ -1,3 +1,3 @@
-MD5 (archmage-0.0.6.tar.gz) = 0ab0e7c51fbf10be0a2719f5b5f329f8
-SHA256 (archmage-0.0.6.tar.gz) = c479637a6b88e8a9f7b63dbbdc5f3f2358897698d7ea1e5347f3e8578c982585
-SIZE (archmage-0.0.6.tar.gz) = 140839
+MD5 (archmage-0.0.7.tar.gz) = 7535427b04c6f6f504ecd2fccc6dd268
+SHA256 (archmage-0.0.7.tar.gz) = 368fbe7ee510b43519f42418b9c205f94b28d429a363a28d3056c1eef8d64b94
+SIZE (archmage-0.0.7.tar.gz) = 21753
diff -urN /usr/ports/textproc/archmage/files/patch-aa archmage/files/patch-aa
--- /usr/ports/textproc/archmage/files/patch-aa Sun Feb 27 21:14:44 2005
+++ archmage/files/patch-aa Thu Jan 1 03:00:00 1970
@@ -1,33 +0,0 @@
---- setup.py.orig Fri Aug 15 08:11:14 2003
-+++ setup.py Sat Feb 26 12:29:32 2005
-@@ -12,9 +12,9 @@
- url = "archmage.sf.net",
- version = "0.0.6",
-
-- py_modules = ['chmlib', 'CHM', 'mod_chm'],
-- scripts = ['archmage'],
-- data_files = [ ('/etc/', [ 'arch.conf' ] ),
-+ py_modules = ['archmage.chmlib', 'archmage.CHM', 'archmage.mod_chm'],
-+ scripts = ['archmage/archmage'],
-+ data_files = [ ('etc/', [ 'arch.conf' ] ),
- ( 'share/archmage/templates/',
- ['templates/arch_contents.html',
- 'templates/arch_frameset.html',
-@@ -65,13 +65,11 @@
- 'templates/icons/7.gif',
- 'templates/icons/8.gif',
- 'templates/icons/9.gif']) ],
-- ext_modules = [ Extension(name = '_chmlib',
-+ ext_modules = [ Extension(name = 'archmage._chmlib',
- sources =
-- [ 'chmlib/chm_lib.c',
-- 'chmlib/wrapper.c',
-- 'chmlib/lzx.c',
-- 'chmlib/az_chmlib_add.c'
-+ [ 'chmlib/wrapper.c',
- ],
-- include_dirs=["chmlib"])
-+ libraries=["chm"]
-+ )
- ]
- )
diff -urN /usr/ports/textproc/archmage/files/patch-ab archmage/files/patch-ab
--- /usr/ports/textproc/archmage/files/patch-ab Sun Apr 3 20:14:02 2005
+++ archmage/files/patch-ab Thu Jan 1 03:00:00 1970
@@ -1,29 +0,0 @@
---- chmlib/chm_lib.h.orig Sun Apr 3 19:53:57 2005
-+++ chmlib/chm_lib.h Sun Apr 3 19:54:41 2005
-@@ -139,18 +139,15 @@
- /* I386, 32-bit, non-Windows */
- /* Sparc */
- /* MIPS */
--#elif __i386__ || __sun || __sgi
--typedef unsigned char UChar;
--typedef short Int16;
--typedef unsigned short UInt16;
--typedef long Int32;
--typedef unsigned long UInt32;
--typedef long long Int64;
--typedef unsigned long long UInt64;
- #else
--
--/* yielding an error is preferable to yielding incorrect behavior */
--#error "Please define the sized types for your platform in chm_lib.c"
-+/* In Unix we have fixed size types in sys/types.h */
-+typedef unsigned char UChar;
-+typedef int16_t Int16;
-+typedef uint16_t UInt16;
-+typedef int32_t Int32;
-+typedef uint32_t UInt32;
-+typedef int64_t Int64;
-+typedef uint64_t UInt64;
- #endif
-
-
diff -urN /usr/ports/textproc/archmage/pkg-plist archmage/pkg-plist
--- /usr/ports/textproc/archmage/pkg-plist Sun Feb 27 21:14:44 2005
+++ archmage/pkg-plist Sat Apr 15 11:45:11 2006
@@ -1,5 +1,5 @@
bin/archmage
-etc/arch.conf
+etc/archmage/arch.conf
%%DATADIR%%/templates/arch_contents.html
%%DATADIR%%/templates/arch_frameset.html
%%DATADIR%%/templates/arch_header.html
@@ -48,18 +48,16 @@
%%DATADIR%%/templates/icons/7.gif
%%DATADIR%%/templates/icons/8.gif
%%DATADIR%%/templates/icons/9.gif
-%%PYTHON_SITELIBDIR%%/archmage.pth
-%%PYTHON_SITELIBDIR%%/archmage/CHM.py
-%%PYTHON_SITELIBDIR%%/archmage/CHM.pyc
-%%PYTHON_SITELIBDIR%%/archmage/CHM.pyo
-%%PYTHON_SITELIBDIR%%/archmage/_chmlib.so
-%%PYTHON_SITELIBDIR%%/archmage/chmlib.py
-%%PYTHON_SITELIBDIR%%/archmage/chmlib.pyc
-%%PYTHON_SITELIBDIR%%/archmage/chmlib.pyo
-%%PYTHON_SITELIBDIR%%/archmage/mod_chm.py
-%%PYTHON_SITELIBDIR%%/archmage/mod_chm.pyc
-%%PYTHON_SITELIBDIR%%/archmage/mod_chm.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/archmage
+%%PYTHON_SITELIBDIR%%/archmod/CHM.py
+%%PYTHON_SITELIBDIR%%/archmod/CHM.pyc
+%%PYTHON_SITELIBDIR%%/archmod/CHM.pyo
+%%PYTHON_SITELIBDIR%%/archmod/__init__.py
+%%PYTHON_SITELIBDIR%%/archmod/__init__.pyc
+%%PYTHON_SITELIBDIR%%/archmod/__init__.pyo
+%%PYTHON_SITELIBDIR%%/archmod/mod_chm.py
+%%PYTHON_SITELIBDIR%%/archmod/mod_chm.pyc
+%%PYTHON_SITELIBDIR%%/archmod/mod_chm.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/archmod
@dirrm %%DATADIR%%/templates/icons
@dirrm %%DATADIR%%/templates
@dirrm %%DATADIR%%
--- archmage.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4440a651.13823be8.29ca.6383>