Date: Sun, 16 Apr 2006 02:00:27 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/95818: Update port: textproc/archmage to 0.0.7 Message-ID: <20060416020027.1920b7db.tkato432@yahoo.com> Resent-Message-ID: <200604151710.k3FHAG9L064773@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95818
>Category: ports
>Synopsis: Update port: textproc/archmage to 0.0.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 15 17:10:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p15 i386
>Organization:
>Environment:
>Description:
- Update to version 0.0.7
Remove file:
files/patch-aa
files/patch-ab
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/textproc/archmage/Makefile textproc/archmage/Makefile
--- /usr/ports/textproc/archmage/Makefile Sat Apr 15 04:30:45 2006
+++ textproc/archmage/Makefile Sat Apr 15 16:36:53 2006
@@ -6,35 +6,30 @@
#
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
+
+MAN1= archmage.1
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/
+ @${REINPLACE_CMD} -e \
+ 's|/usr/share|${PREFIX}/share|g' ${WRKSRC}/arch.conf
+.for file in setup.py archmod/CHM.py debian/archmage.1
+ @${REINPLACE_CMD} -e \
+ 's|"/etc/|"${PREFIX}/etc/|g' ${WRKSRC}/${file}
+.endfor
post-install:
- @${ECHO} "archmage" > ${PYTHON_SITELIBDIR}/archmage.pth
+ ${INSTALL_MAN} ${WRKSRC}/debian/archmage.1 ${MANPREFIX}/man/man1
.include <bsd.port.mk>
diff -urN /usr/ports/textproc/archmage/distinfo textproc/archmage/distinfo
--- /usr/ports/textproc/archmage/distinfo Tue Jan 24 13:41:31 2006
+++ textproc/archmage/distinfo Sat Apr 15 15:40:16 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 textproc/archmage/files/patch-aa
--- /usr/ports/textproc/archmage/files/patch-aa Tue Mar 1 02:30:41 2005
+++ textproc/archmage/files/patch-aa Thu Jan 1 09: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 textproc/archmage/files/patch-ab
--- /usr/ports/textproc/archmage/files/patch-ab Mon Apr 4 01:14:02 2005
+++ textproc/archmage/files/patch-ab Thu Jan 1 09: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 textproc/archmage/pkg-plist
--- /usr/ports/textproc/archmage/pkg-plist Tue Mar 1 02:30:41 2005
+++ textproc/archmage/pkg-plist Sat Apr 15 16:31:48 2006
@@ -1,65 +1,64 @@
bin/archmage
-etc/arch.conf
+etc/archmage/arch.conf
+%%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
%%DATADIR%%/templates/arch_contents.html
+%%DATADIR%%/templates/arch_css.css
%%DATADIR%%/templates/arch_frameset.html
%%DATADIR%%/templates/arch_header.html
-%%DATADIR%%/templates/index.html
-%%DATADIR%%/templates/arch_css.css
-%%DATADIR%%/templates/icons/next.gif
%%DATADIR%%/templates/icons/0.gif
%%DATADIR%%/templates/icons/1.gif
+%%DATADIR%%/templates/icons/10.gif
%%DATADIR%%/templates/icons/11.gif
%%DATADIR%%/templates/icons/12.gif
-%%DATADIR%%/templates/icons/17.gif
-%%DATADIR%%/templates/icons/2.gif
-%%DATADIR%%/templates/icons/22.gif
-%%DATADIR%%/templates/icons/90.gif
-%%DATADIR%%/templates/icons/91.gif
-%%DATADIR%%/templates/icons/92.gif
-%%DATADIR%%/templates/icons/93.gif
-%%DATADIR%%/templates/icons/94.gif
-%%DATADIR%%/templates/icons/95.gif
-%%DATADIR%%/templates/icons/96.gif
-%%DATADIR%%/templates/icons/97.gif
-%%DATADIR%%/templates/icons/98.gif
-%%DATADIR%%/templates/icons/99.gif
-%%DATADIR%%/templates/icons/10.gif
-%%DATADIR%%/templates/icons/prev.gif
%%DATADIR%%/templates/icons/13.gif
%%DATADIR%%/templates/icons/14.gif
%%DATADIR%%/templates/icons/15.gif
%%DATADIR%%/templates/icons/16.gif
+%%DATADIR%%/templates/icons/17.gif
%%DATADIR%%/templates/icons/18.gif
%%DATADIR%%/templates/icons/19.gif
+%%DATADIR%%/templates/icons/2.gif
%%DATADIR%%/templates/icons/20.gif
%%DATADIR%%/templates/icons/21.gif
+%%DATADIR%%/templates/icons/22.gif
%%DATADIR%%/templates/icons/23.gif
%%DATADIR%%/templates/icons/24.gif
%%DATADIR%%/templates/icons/25.gif
%%DATADIR%%/templates/icons/26.gif
%%DATADIR%%/templates/icons/27.gif
+%%DATADIR%%/templates/icons/3.gif
%%DATADIR%%/templates/icons/35.gif
%%DATADIR%%/templates/icons/37.gif
%%DATADIR%%/templates/icons/39.gif
-%%DATADIR%%/templates/icons/3.gif
%%DATADIR%%/templates/icons/4.gif
%%DATADIR%%/templates/icons/5.gif
%%DATADIR%%/templates/icons/6.gif
%%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
+%%DATADIR%%/templates/icons/90.gif
+%%DATADIR%%/templates/icons/91.gif
+%%DATADIR%%/templates/icons/92.gif
+%%DATADIR%%/templates/icons/93.gif
+%%DATADIR%%/templates/icons/94.gif
+%%DATADIR%%/templates/icons/95.gif
+%%DATADIR%%/templates/icons/96.gif
+%%DATADIR%%/templates/icons/97.gif
+%%DATADIR%%/templates/icons/98.gif
+%%DATADIR%%/templates/icons/99.gif
+%%DATADIR%%/templates/icons/next.gif
+%%DATADIR%%/templates/icons/prev.gif
+%%DATADIR%%/templates/index.html
@dirrm %%DATADIR%%/templates/icons
@dirrm %%DATADIR%%/templates
@dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/archmod
+@dirrm etc/archmage
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060416020027.1920b7db.tkato432>