FreeBSD Bugzilla – Attachment 51457 Details for
Bug 78152
Archmage is not compatible with textproc/pychm
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 4.31 KB, created by
Vsevolod Stakhov
on 2005-02-27 16:30:24 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Vsevolod Stakhov
Created:
2005-02-27 16:30:24 UTC
Size:
4.31 KB
patch
obsolete
>diff -urP /tmp/archmage/Makefile textproc/archmage/Makefile >--- /tmp/archmage/Makefile Sat Feb 26 12:37:15 2005 >+++ textproc/archmage/Makefile Sat Feb 26 12:24:30 2005 >@@ -2,7 +2,7 @@ > # Date created: 22 February 2005 > # Whom: Vsevolod Stakhov <vsevolod@highsecure.ru> > # >-# $FreeBSD$ >+# $FreeBSD: ports/textproc/archmage/Makefile,v 1.1 2005/02/22 20:06:53 sem Exp $ > # > > PORTNAME= archmage >@@ -14,7 +14,7 @@ > 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 +26,14 @@ > 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 -urP /tmp/archmage/files/patch-aa textproc/archmage/files/patch-aa >--- /tmp/archmage/files/patch-aa Sat Feb 26 12:37:15 2005 >+++ textproc/archmage/files/patch-aa Sat Feb 26 12:29:37 2005 >@@ -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 -urP /tmp/archmage/pkg-plist textproc/archmage/pkg-plist >--- /tmp/archmage/pkg-plist Sat Feb 26 12:37:15 2005 >+++ textproc/archmage/pkg-plist Sat Feb 26 12:35:03 2005 >@@ -48,13 +48,18 @@ > %%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.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.pyo >+%%PYTHON_SITELIBDIR%%/archmage/CHM.pyc >+%%PYTHON_SITELIBDIR%%/archmage/chmlib.py >+%%PYTHON_SITELIBDIR%%/archmage/chmlib.pyc >+%%PYTHON_SITELIBDIR%%/archmage/chmlib.pyo >+%%PYTHON_SITELIBDIR%%/archmage/_chmlib.so >+%%PYTHON_SITELIBDIR%%/archmage/mod_chm.py >+%%PYTHON_SITELIBDIR%%/archmage/mod_chm.pyo >+%%PYTHON_SITELIBDIR%%/archmage/mod_chm.pyc >+@dirrm %%PYTHON_SITELIBDIR%%/archmage > @dirrm %%DATADIR%%/templates/icons > @dirrm %%DATADIR%%/templates >+@dirrm %%DATADIR%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 78152
: 51457 |
51458
|
51459
|
51460
|
51461