diff options
| author | Sergey Matveychuk <sem@FreeBSD.org> | 2005-02-27 18:14:44 +0000 |
|---|---|---|
| committer | Sergey Matveychuk <sem@FreeBSD.org> | 2005-02-27 18:14:44 +0000 |
| commit | 5db761d1d8ba3a0bb5adc2cb5ca8d46ccc1a1880 (patch) | |
| tree | 8bcf3bd71c273b9193c112da83626449bbcfe1ba /textproc | |
| parent | Update to development version 3.9.1 (diff) | |
- Drop dependence on pychm due some incompatible.
Depend on chmlib directly.
- As result files placement has changed.
PR: ports/76152
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=129913
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/archmage/Makefile | 12 | ||||
| -rw-r--r-- | textproc/archmage/files/patch-aa | 26 | ||||
| -rw-r--r-- | textproc/archmage/pkg-plist | 21 |
3 files changed, 40 insertions, 19 deletions
diff --git a/textproc/archmage/Makefile b/textproc/archmage/Makefile index cfbb38321768..8d5d7ae2d234 100644 --- a/textproc/archmage/Makefile +++ b/textproc/archmage/Makefile @@ -7,6 +7,7 @@ PORTNAME= archmage PORTVERSION= 0.0.6 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= archmage @@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= archmage MAINTAINER= vsevolod@highsecure.ru COMMENT= Extensible reader/decompiler of files in CHM format -RUN_DEPENDS= ${PYTHONPREFIX_SITELIBDIR}/chm/_chmlib.so:${PORTSDIR}/textproc/pychm +LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chmlib NO_BUILD= yes USE_PYTHON= yes @@ -26,5 +27,14 @@ 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 .include <bsd.port.mk> diff --git a/textproc/archmage/files/patch-aa b/textproc/archmage/files/patch-aa index 451a84a14af6..ab5e2eb46749 100644 --- a/textproc/archmage/files/patch-aa +++ b/textproc/archmage/files/patch-aa @@ -1,25 +1,33 @@ ---- setup.py.orig Tue Feb 22 19:18:40 2005 -+++ setup.py Tue Feb 22 19:19:26 2005 -@@ -14,7 +14,7 @@ +--- 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'], +- 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,4 @@ +@@ -65,13 +65,11 @@ 'templates/icons/7.gif', 'templates/icons/8.gif', 'templates/icons/9.gif']) ], - ext_modules = [ Extension(name = '_chmlib', -- sources = ++ 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 --git a/textproc/archmage/pkg-plist b/textproc/archmage/pkg-plist index 9bf30ddcf75d..ba5fc8b73046 100644 --- a/textproc/archmage/pkg-plist +++ b/textproc/archmage/pkg-plist @@ -48,15 +48,18 @@ etc/arch.conf %%DATADIR%%/templates/icons/7.gif %%DATADIR%%/templates/icons/8.gif %%DATADIR%%/templates/icons/9.gif -%%PYTHON_SITELIBDIR%%/CHM.py -%%PYTHON_SITELIBDIR%%/CHM.pyo -%%PYTHON_SITELIBDIR%%/CHM.pyc -%%PYTHON_SITELIBDIR%%/chmlib.py -%%PYTHON_SITELIBDIR%%/chmlib.pyc -%%PYTHON_SITELIBDIR%%/chmlib.pyo -%%PYTHON_SITELIBDIR%%/mod_chm.py -%%PYTHON_SITELIBDIR%%/mod_chm.pyo -%%PYTHON_SITELIBDIR%%/mod_chm.pyc +%%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 @dirrm %%DATADIR%%/templates/icons @dirrm %%DATADIR%%/templates @dirrm %%DATADIR%% |