Attachment 117973 Details for Bug 160132 – file.diff

[patch] file.diff

file.diff (text/plain), 4.18 KB, created by tkato432 on 2011-08-24 19:50:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2011-08-24 19:50:32 UTC

Size: 4.18 KB

patch

obsolete

>diff -urN /usr/ports/net-im/cjc/Makefile net-im/cjc/Makefile
>--- /usr/ports/net-im/cjc/Makefile	2011-02-26 03:28:33.000000000 +0900
>+++ net-im/cjc/Makefile	2011-08-18 22:20:53.000000000 +0900
>@@ -6,41 +6,37 @@
> #
> 
> PORTNAME=	cjc
>-PORTVERSION=	1.0.0.675
>-PORTREVISION=	1
>+PORTVERSION=	1.2.1
> CATEGORIES=	net-im python
>-MASTER_SITES=	CENKES http://jabberstudio.2nw.net/cjc/
>-# svn export -r675 http://cjc.jajcus.net/svn/cjc/trunk cjc
>+MASTER_SITES=	http://cloud.github.com/downloads/Jajcus/cjc/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	The Console Jabber Client
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=1.0.0.644:${PORTSDIR}/net-im/py-pyxmpp
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USE_BZIP2=	yes
>-USE_PYTHON=	2.5+
>-MAKE_ENV+=	prefix=${PREFIX} pkg_datadir=${DATADIR} INSTALL_DIR="${INSTALL} -d"
>-MAKE_ARGS+=	-E prefix -E pkg_datadir -E pkg_docdir -E INSTALL -E INSTALL_DATA \
>-		-E INSTALL_DIR
>-
>-.ifndef NOPORTDOCS
>-BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
>-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
>-MAKE_ENV+=	pkg_docdir=${DOCSDIR}
>-PORTDOCS=	manual.html COPYING README TODO
>-.endif
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=1.1.0:${PORTSDIR}/net-im/py-pyxmpp
> 
>-post-extract:
>-	@${MKDIR} ${WRKSRC}/.svn
>+USE_PYTHON=	2.6+
> 
> post-patch:
>-.ifdef NOPORTDOCS
>-	@${REINPLACE_CMD} -e '/^DOCS=/s|=.*|=|' -e '/$$(DESTDIR)$$(pkg_docdir)/d' ${WRKSRC}/Makefile
>+	@${GREP} -lR "/usr/bin/python" ${WRKSRC} | ${XARGS} \
>+		${REINPLACE_CMD} -e "s|/usr/bin/python|${PYTHON_CMD}|"
>+	@${REINPLACE_CMD} -e \
>+		"s|prefix=.*|prefix=${PREFIX}| ; \
>+		 /pkg_docdir/s|^|#|g ; \
>+		 s|INSTALL=.*|INSTALL=${INSTALL}| ; \
>+		 s|INSTALL_DATA=.*|INSTALL_DATA=${INSTALL_DATA}| ; \
>+		 s|INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|g" ${WRKSRC}/Makefile
>+
>+post-install:
>+.if !defined(NOPORTDOCS)
>+	@${MKDIR} ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
> .endif
>-	@${GREP} -lr '/usr/bin/python' ${WRKSRC} | \
>-		${XARGS} ${REINPLACE_CMD} -e "s!/usr/bin/python!${PYTHON_CMD}!"
>-	@${REINPLACE_CMD} -e '/^XSLTPROC=/s|=.*|=${LOCALBASE}/bin/xsltproc|' \
>-			-e '/^XSL_DIR=/s|=.*|=${LOCALBASE}/share/xsl/docbook/|' ${WRKSRC}/doc/Makefile
>-	@${REINPLACE_CMD} -e '/^DOCS=/s|ChangeLog||' ${WRKSRC}/Makefile
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/net-im/cjc/distinfo net-im/cjc/distinfo
>--- /usr/ports/net-im/cjc/distinfo	2011-02-26 03:28:33.000000000 +0900
>+++ net-im/cjc/distinfo	2011-08-18 21:13:13.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (cjc-1.0.0.675.tar.bz2) = 6eab3aa0677a54aece74cdcbec1bafed3d901472937598305e81ce0632d6c670
>-SIZE (cjc-1.0.0.675.tar.bz2) = 75969
>+SHA256 (cjc-1.2.1.tar.gz) = 8dcfb6969576b16d4ee6d8191751dea118dd9fd9efdba6ce524a6dcfb9196606
>+SIZE (cjc-1.2.1.tar.gz) = 152563
>diff -urN /usr/ports/net-im/cjc/pkg-plist net-im/cjc/pkg-plist
>--- /usr/ports/net-im/cjc/pkg-plist	2006-11-30 12:58:59.000000000 +0900
>+++ net-im/cjc/pkg-plist	2011-08-18 22:04:10.000000000 +0900
>@@ -13,6 +13,8 @@
> %%DATADIR%%/cjc/main.pyc
> %%DATADIR%%/cjc/plugin.py
> %%DATADIR%%/cjc/plugin.pyc
>+%%DATADIR%%/cjc/plugins.py
>+%%DATADIR%%/cjc/plugins.pyc
> %%DATADIR%%/cjc/themes.py
> %%DATADIR%%/cjc/themes.pyc
> %%DATADIR%%/cjc/tls.py
>@@ -63,6 +65,8 @@
> %%DATADIR%%/plugins/disco.pyc
> %%DATADIR%%/plugins/events.py
> %%DATADIR%%/plugins/events.pyc
>+%%DATADIR%%/plugins/file_logger.py
>+%%DATADIR%%/plugins/file_logger.pyc
> %%DATADIR%%/plugins/jogger_pl.py
> %%DATADIR%%/plugins/jogger_pl.pyc
> %%DATADIR%%/plugins/message.py
>@@ -81,6 +85,8 @@
> %%DATADIR%%/plugins/roster_ei.pyc
> %%DATADIR%%/plugins/shell.py
> %%DATADIR%%/plugins/shell.pyc
>+%%DATADIR%%/plugins/sqlite_archive.py
>+%%DATADIR%%/plugins/sqlite_archive.pyc
> %%DATADIR%%/plugins/test.py
> %%DATADIR%%/plugins/test.pyc
> %%DATADIR%%/plugins/vcard.py
>@@ -89,7 +95,12 @@
> %%DATADIR%%/plugins/version.pyc
> %%DATADIR%%/plugins/xmlconsole.py
> %%DATADIR%%/plugins/xmlconsole.pyc
>+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/TODO
>+%%PORTDOCS%%%%DOCSDIR%%/manual.html
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrm %%DATADIR%%/plugins
> @dirrm %%DATADIR%%/cjc/ui
> @dirrm %%DATADIR%%/cjc
>-@dirrm %%DATADIR%%/plugins
> @dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 160132: 117973