Update to 1.1.0

PR:		ports/80771
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

4 files changed, 27 insertions, 69 deletions

diff --git a/news/pyne/Makefile b/news/pyne/Makefile
index f68dddb14a65..9288c7852a32 100644
--- a/news/pyne/Makefile
+++ b/news/pyne/Makefile
@@ -7,34 +7,33 @@
 #
 
 PORTNAME=	pyne
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.1.0
 CATEGORIES=	news python mail
 MASTER_SITES=	http://www.soul-less.pwp.blueyonder.co.uk/pyne/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An X11 offline Newsreader/Emailer
 
-BUILD_DEPENDS=	pygtk-codegen-2.0:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS=	${BUILD_DEPENDS}
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT}
-.endif
+BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src/po
+INSTALL_WRKSRC=	${WRKDIR}/${DISTNAME}/src/po
 
-BROKEN=		"Broken pkg-plist"
+USE_GNOME=	pygtk2
+USE_PYTHON=	yes
 
-USE_REINPLACE=		yes
-USE_PYTHON=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAKE_ENV=		PYTHON_SITELIBDIR="${PYTHON_SITELIBDIR}"
-ALL_TARGET=		default
+pre-build:
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/pyne.sh
+	@${ECHO_CMD} "exec ${PYTHON_CMD} -O ${PYTHON_SITELIBDIR}/pyne/pyne.py \$$*" >> ${WRKDIR}/pyne.sh
 
-pre-configure:
-	@${REINPLACE_CMD} -e "s@[(]PREFIX[)]\/lib@(PYTHON_SITELIBDIR)@g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s@pybins=\(.*\)@pybins=\${PYTHON_VERSION}@" ${WRKSRC}/configure
+post-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} yencdec.c -o yencdec
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/yencdec
+	${INSTALL_SCRIPT} ${WRKDIR}/pyne.sh ${PREFIX}/bin/pyne
+	${INSTALL_PROGRAM} ${WRKSRC}/yencdec  ${PREFIX}/bin/yencdec
+	@${MKDIR} ${PYTHON_SITELIBDIR}/pyne
+	${TAR} -C ${WRKSRC}/src --exclude po --exclude test -cf - . | \
+		${TAR} -C ${PYTHON_SITELIBDIR}/pyne --unlink -xf -
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PYTHON_SITELIBDIR}/pyne
+	${PYTHON_CMD} -O -c "import compileall ; compileall.compile_dir(\"${PYTHON_SITELIBDIR}/pyne\")"
 
 .include <bsd.port.mk>
diff --git a/news/pyne/distinfo b/news/pyne/distinfo
index 375df7d96015..db61d053063c 100644
--- a/news/pyne/distinfo
+++ b/news/pyne/distinfo
@@ -1,2 +1,2 @@
-MD5 (pyne-1.0.1.tar.gz) = 589c6cd52ab3f2fb1a9c86b897af56f2
-SIZE (pyne-1.0.1.tar.gz) = 214042
+MD5 (pyne-1.1.0.tar.gz) = e99573e3eea45c23385de301b0d41873
+SIZE (pyne-1.1.0.tar.gz) = 218018
diff --git a/news/pyne/files/patch-Makefile.in b/news/pyne/files/patch-Makefile.in
deleted file mode 100644
index 20d936af8e55..000000000000
--- a/news/pyne/files/patch-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in.orig	Mon Aug 30 22:23:03 2004
-+++ Makefile.in	Thu Sep  2 22:13:41 2004
-@@ -1,6 +1,6 @@
- 
--# install pyne here... 
--export PREFIX = @prefix@
-+# install pyne here...
-+PREFIX = @prefix@
- PYTHON = @PYTHON@
- VERSION = @VERSION@
- 
-@@ -48,7 +48,7 @@
- 	cp src/AppRun Pyne/AppRun
- 	chmod +x Pyne/AppRun
- 	cp -rfv src/* Pyne
--	
-+
- 	@echo "Compiling modules to bytecode..."
- 	$(PYTHON) -O -c "import compileall ; compileall.compile_dir(\"Pyne/\")"
- 
-@@ -60,7 +60,7 @@
- 	rm -rfv $(PREFIX)/lib/pyne
- 
- pyne:
--	-gcc -Wall -O2 yencdec.c -o yencdec
-+	-$(CC) $(CFLAGS) yencdec.c -o yencdec
- 	@echo
- 	@echo "Pyne will install to $(PREFIX). Pass --prefix option to ./configure to change this"
- 	@echo "Type 'make install' when ready."
diff --git a/news/pyne/pkg-plist b/news/pyne/pkg-plist
index 4c27b09c54b1..ccce31e34705 100644
--- a/news/pyne/pkg-plist
+++ b/news/pyne/pkg-plist
@@ -88,17 +88,6 @@ bin/yencdec
 %%PYTHON_SITELIBDIR%%/pyne/msgfilter.pyo
 %%PYTHON_SITELIBDIR%%/pyne/personality.py
 %%PYTHON_SITELIBDIR%%/pyne/personality.pyo
-%%PYTHON_SITELIBDIR%%/pyne/po/Makefile
-%%PYTHON_SITELIBDIR%%/pyne/po/Makefile.orig
-%%PYTHON_SITELIBDIR%%/pyne/po/es_ES.mo
-%%PYTHON_SITELIBDIR%%/pyne/po/es_ES.po
-%%PYTHON_SITELIBDIR%%/pyne/po/es_ES.po.orig
-%%PYTHON_SITELIBDIR%%/pyne/po/nl.mo
-%%PYTHON_SITELIBDIR%%/pyne/po/nl.po
-%%PYTHON_SITELIBDIR%%/pyne/po/pygettext.py
-%%PYTHON_SITELIBDIR%%/pyne/po/pygettext.pyo
-%%PYTHON_SITELIBDIR%%/pyne/po/zh_TW.Big5.mo
-%%PYTHON_SITELIBDIR%%/pyne/po/zh_TW.Big5.po
 %%PYTHON_SITELIBDIR%%/pyne/printmodule.py
 %%PYTHON_SITELIBDIR%%/pyne/printmodule.pyo
 %%PYTHON_SITELIBDIR%%/pyne/ptk/__init__.py
@@ -107,8 +96,6 @@ bin/yencdec
 %%PYTHON_SITELIBDIR%%/pyne/ptk/big_edit_box.pyo
 %%PYTHON_SITELIBDIR%%/pyne/ptk/folder_tree.py
 %%PYTHON_SITELIBDIR%%/pyne/ptk/folder_tree.pyo
-%%PYTHON_SITELIBDIR%%/pyne/ptk/menu_maker.py
-%%PYTHON_SITELIBDIR%%/pyne/ptk/menu_maker.pyo
 %%PYTHON_SITELIBDIR%%/pyne/ptk/message_tree.py
 %%PYTHON_SITELIBDIR%%/pyne/ptk/message_tree.pyo
 %%PYTHON_SITELIBDIR%%/pyne/ptk/misc_widgets.py
@@ -132,8 +119,9 @@ bin/yencdec
 %%PYTHON_SITELIBDIR%%/pyne/sort.py
 %%PYTHON_SITELIBDIR%%/pyne/sort.pyo
 %%PYTHON_SITELIBDIR%%/pyne/timeoutsocket.py
-%%PYTHON_SITELIBDIR%%/pyne/timeoutsocket.py.bak
 %%PYTHON_SITELIBDIR%%/pyne/timeoutsocket.pyo
+%%PYTHON_SITELIBDIR%%/pyne/ui_mainwin.xml
+%%PYTHON_SITELIBDIR%%/pyne/ui_msgeditbox.xml
 %%PYTHON_SITELIBDIR%%/pyne/userconfig.py
 %%PYTHON_SITELIBDIR%%/pyne/userconfig.pyo
 %%PYTHON_SITELIBDIR%%/pyne/utils.py
@@ -142,15 +130,15 @@ bin/yencdec
 %%PYTHON_SITELIBDIR%%/pyne/viewattach.pyo
 share/locale/es_ES/LC_MESSAGES/pyne.mo
 share/locale/nl/LC_MESSAGES/pyne.mo
-@dirrm %%PYTHON_SITELIBDIR%%/pyne/boxformats
+share/locale/zh_TW.Big5/LC_MESSAGES/pyne.mo
+@dirrm %%PYTHON_SITELIBDIR%%/pyne/ptk
+@dirrm %%PYTHON_SITELIBDIR%%/pyne/icons
+@dirrm %%PYTHON_SITELIBDIR%%/pyne/docs
+@dirrm %%PYTHON_SITELIBDIR%%/pyne/boxtypes/nntp_io
 @dirrm %%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_send
 @dirrm %%PYTHON_SITELIBDIR%%/pyne/boxtypes/mail_recv
-@dirrm %%PYTHON_SITELIBDIR%%/pyne/boxtypes/nntp_io
 @dirrm %%PYTHON_SITELIBDIR%%/pyne/boxtypes
-@dirrm %%PYTHON_SITELIBDIR%%/pyne/docs
-@dirrm %%PYTHON_SITELIBDIR%%/pyne/icons
-@dirrm %%PYTHON_SITELIBDIR%%/pyne/po
-@dirrm %%PYTHON_SITELIBDIR%%/pyne/ptk
+@dirrm %%PYTHON_SITELIBDIR%%/pyne/boxformats
 @dirrm %%PYTHON_SITELIBDIR%%/pyne
 @unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl 2>/dev/null || true