- Update to 16b

Approved by:	garga (mentor)

7 files changed, 81 insertions, 157 deletions

diff --git a/emulators/xgngeo/Makefile b/emulators/xgngeo/Makefile
index e2bf90b60c5..97fc56d9fbb 100644
--- a/emulators/xgngeo/Makefile
+++ b/emulators/xgngeo/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	xgngeo
-PORTVERSION=	15
+PORTVERSION=	16b
 CATEGORIES=	emulators games
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME:S/xg/XG/}-${PORTVERSION:S/b/_beta/}
 DIST_SUBDIR=	gngeo
 
 MAINTAINER=	acm@FreeBSD.org
@@ -18,35 +19,14 @@ COMMENT=	Fronted (GUI) for gngeo
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk2 \
 		gngeo:${PORTSDIR}/emulators/gngeo
 
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
+USE_PYDISTUTILS=	yes
 NO_BUILD=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/${PORTNAME}.py \
-		${WRKSRC}/data/py/configfile.py
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/${PORTNAME}.py \
-		${WRKSRC}/data/py/configfile.py
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/xgngeo.py ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/data/rominfos.dtd ${WRKSRC}/data/rominfos.xml ${DATADIR}
-
-.for DIRE in img py
-	${MKDIR} ${DATADIR}/${DIRE}
-	@cd ${WRKSRC}/data/${DIRE} && \
-		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/${DIRE}/{}" \; && \
-			${FIND} -E * -type f -iregex ".*\.(py|pyc|png|po|mo)" \
-				-exec ${INSTALL_DATA} "{}" "${DATADIR}/${DIRE}/{}" \;
-.endfor
-
-.for LANG in es fr pl pt_BR
-	@cd ${WRKSRC}/data/lang/${LANG}/LC_MESSAGES && \
-		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/locale/${LANG}/LC_MESSAGES/{}" \;
-.endfor
+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/data/py/configfile.py
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/emulators/xgngeo/distinfo b/emulators/xgngeo/distinfo
index 597f8d0ce73..384ba70d19d 100644
--- a/emulators/xgngeo/distinfo
+++ b/emulators/xgngeo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gngeo/xgngeo-15.tar.bz2) = e0c444324376d4c5dad5ecf701822e3c
-SHA256 (gngeo/xgngeo-15.tar.bz2) = db462e8aae76d3d9688168abbc1411b3123a9efba8090286490a336df1599efb
-SIZE (gngeo/xgngeo-15.tar.bz2) = 296082
+MD5 (gngeo/XGngeo-16_beta.tar.bz2) = cde3c42ec5c981614b5be02cb8381c4c
+SHA256 (gngeo/XGngeo-16_beta.tar.bz2) = 52d6a35d9ee492493785d6de0d314704bb280d6cf96587da80fa4f05c1e898ff
+SIZE (gngeo/XGngeo-16_beta.tar.bz2) = 338656
diff --git a/emulators/xgngeo/files/patch-data-py___init__.py b/emulators/xgngeo/files/patch-data-py___init__.py
new file mode 100644
index 00000000000..c1d113a0d0d
--- /dev/null
+++ b/emulators/xgngeo/files/patch-data-py___init__.py
@@ -0,0 +1,11 @@
+--- data/py/__init__.py	Tue Aug  1 00:19:19 2006
++++ data/py/__init__.py	Tue Aug  1 00:19:52 2006
+@@ -33,7 +33,7 @@
+ datarootpath = os.path.join(sys.prefix,'share','xgngeo')
+ 
+ #Internationalization.
+-gettext.install("xgngeo",os.path.join(datarootpath,"locale"))
++gettext.install("xgngeo",os.path.join(sys.prefix,"share","locale"))
+ 
+ class XGngeo:
+ 	def __init__(self):
diff --git a/emulators/xgngeo/files/patch-data-py_configfile.py b/emulators/xgngeo/files/patch-data-py_configfile.py
index ca36c82fd3f..affdee6722d 100644
--- a/emulators/xgngeo/files/patch-data-py_configfile.py
+++ b/emulators/xgngeo/files/patch-data-py_configfile.py
@@ -1,32 +1,11 @@
---- data/py/configfile.py	Thu Jul 14 13:48:58 2005
-+++ data/py/configfile.py	Fri Apr 14 01:25:46 2006
-@@ -33,7 +33,7 @@
- as the `gngeorc'."""
- 
- 	def __init__(self):
--		self.xgngeoconfPath = "data/xgngeo.conf" #Path to XGngeo config file.
-+		self.xgngeoconfPath =  os.path.join(os.getenv("HOME"),".gngeo/xgngeo.conf") #Path to XGngeo config file.
- 		self.gngeoDir = os.path.expanduser("~/.gngeo") #Gngeo local configuration directory.
- 		self.gngeorcPath = os.path.join(self.gngeoDir,"gngeorc") #Path to Gngeo config file.
- 
-@@ -42,9 +42,9 @@
- 		and XGngeo configuration files."""
- 		return { #Gngeo default.
- 			#Path
+--- data/py/configfile.py	Fri Jul 14 07:30:15 2006
++++ data/py/configfile.py	Tue Aug  1 00:01:53 2006
+@@ -90,7 +90,7 @@
+ 			"68kclock":0,
+ 			"z80clock":0,
+ 			#Other thing section.
 -			"libglpath":"/usr/lib/libGL.so",
 +			"libglpath":"%%X11BASE%%/lib/libGL.so",
- 			"rompath": os.path.join(os.getenv("HOME"),"..."),
--			"romrc":"/usr/local/share/gngeo/romrc",
-+			"romrc":"%%X11BASE%%/share/gngeo/romrc",
- 			#Graphic
- 			"blitter":"soft",
- 			"effect":"none",
-@@ -74,7 +74,7 @@
- 			"previewimages":"false",
- 			"previewimagedir":"data/previewimages/",
- 			"rominfos":"true",
--			"rominfoxml":"data/rominfos.xml",
-+			"rominfoxml":"%%DATADIR%%/rominfos.xml",
- 			"showavailableromsonly":"true"
- 			}
- 
+ 			"sleepidle":"true",
+ 			"bench":"false",
+ 			},{ #XGngeo default.
diff --git a/emulators/xgngeo/files/patch-setup.py b/emulators/xgngeo/files/patch-setup.py
new file mode 100644
index 00000000000..5b0ed7c1187
--- /dev/null
+++ b/emulators/xgngeo/files/patch-setup.py
@@ -0,0 +1,19 @@
+--- setup.py	Tue Aug  1 00:23:11 2006
++++ setup.py	Tue Aug  1 00:23:43 2006
+@@ -48,11 +48,11 @@
+ 		#Plan text documentation.
+ 		(os.path.join("share","xgngeo","doc"),[os.path.join("doc","xgngeo-doc.txt")]),
+ 		#Localization files.
+-		(os.path.join("share","xgngeo","locale","es","LC_MESSAGES"),[os.path.join("data","locale","es","LC_MESSAGES","xgngeo.mo")]), #Spanish
+-		(os.path.join("share","xgngeo","locale","de","LC_MESSAGES"),[os.path.join("data","locale","de","LC_MESSAGES","xgngeo.mo")]), #German
+-		(os.path.join("share","xgngeo","locale","fr","LC_MESSAGES"),[os.path.join("data","locale","fr","LC_MESSAGES","xgngeo.mo")]), #French
+-		(os.path.join("share","xgngeo","locale","pl","LC_MESSAGES"),[os.path.join("data","locale","pl","LC_MESSAGES","xgngeo.mo")]), #Polish
+-		(os.path.join("share","xgngeo","locale","pt_BR","LC_MESSAGES"),[os.path.join("data","locale","pt_BR","LC_MESSAGES","xgngeo.mo")]) #Portuguese of Brazil
++		(os.path.join("share","locale","es","LC_MESSAGES"),[os.path.join("data","locale","es","LC_MESSAGES","xgngeo.mo")]), #Spanish
++		(os.path.join("share","locale","de","LC_MESSAGES"),[os.path.join("data","locale","de","LC_MESSAGES","xgngeo.mo")]), #German
++		(os.path.join("share","locale","fr","LC_MESSAGES"),[os.path.join("data","locale","fr","LC_MESSAGES","xgngeo.mo")]), #French
++		(os.path.join("share","locale","pl","LC_MESSAGES"),[os.path.join("data","locale","pl","LC_MESSAGES","xgngeo.mo")]), #Polish
++		(os.path.join("share","locale","pt_BR","LC_MESSAGES"),[os.path.join("data","locale","pt_BR","LC_MESSAGES","xgngeo.mo")]) #Portuguese of Brazil
+ 		],
+ 	scripts = [os.path.join("data","script","xgngeo_startup.py")] #Startup script.
+ 	)
diff --git a/emulators/xgngeo/files/patch-xgngeo.py b/emulators/xgngeo/files/patch-xgngeo.py
deleted file mode 100644
index 2b8acaa4c57..00000000000
--- a/emulators/xgngeo/files/patch-xgngeo.py
+++ /dev/null
@@ -1,80 +0,0 @@
---- xgngeo.py	Thu Jul 14 13:48:58 2005
-+++ /home/acardenas/xgngeo.py	Thu Mar  2 21:39:00 2006
-@@ -28,14 +28,14 @@
- os.chdir(os.path.abspath(syspath[0]))
- 
- #Add `data/py/' to PATH, then import internal modules.
--syspath.append("data/py/")
-+syspath.append("%%DATADIR%%/py/")
- import command, configfile, history, rominfos, romrcfile
- 
- VERSION = 15
- gngeoDir = os.path.expanduser("~/.gngeo")
- 
- #Internationalization.
--gettext.install("xgngeo","data/lang")
-+gettext.install("xgngeo","%%X11BASE%%/share/locale")
- 
- class XGngeo:
- 	def checkError(self):
-@@ -591,7 +591,7 @@
- 			frame.add(box)
- 
- 			logo = gtk.Image()
--			logo.set_from_file("data/img/chprod.png")
-+			logo.set_from_file("%%DATADIR%%/img/chprod.png")
- 			box.pack_start(logo,False)
- 
- 			box2 = gtk.VBox(spacing=4)
-@@ -1087,7 +1087,7 @@
- 
- 					#Generate key's image
- 					image = gtk.Image()
--					image.set_from_file("data/img/key_%s.png" % key_list[i])
-+					image.set_from_file("%%DATADIR%%/img/key_%s.png" % key_list[i])
- 
- 					box2 = gtk.HBox() #A box...
- 					box2.pack_start(p1keywidgets[i]) #with P1 key...
-@@ -1131,21 +1131,21 @@
- 				if temp_param["country"]=="japan": self.configwidgets['country_japan'].set_active(1)
- 				table.attach(self.configwidgets['country_japan'],0,1,0,1)
- 				image = gtk.Image()
--				image.set_from_file("data/img/japan.png")
-+				image.set_from_file("%%DATADIR%%/img/japan.png")
- 				table.attach(image,0,1,1,2)
- 
- 				self.configwidgets['country_usa'] = gtk.RadioButton(self.configwidgets['country_japan'],_("USA"))
- 				if temp_param["country"]=="usa": self.configwidgets['country_usa'].set_active(1)
- 				table.attach(self.configwidgets['country_usa'],1,2,0,1)
- 				image = gtk.Image()
--				image.set_from_file("data/img/usa.png")
-+				image.set_from_file("%%DATADIR%%/img/usa.png")
- 				table.attach(image,1,2,1,2)
- 
- 				radio = gtk.RadioButton(self.configwidgets['country_japan'],_("Europe"))
- 				if temp_param["country"]=="europe": radio.set_active(1)
- 				table.attach(radio,2,3,0,1)
- 				image = gtk.Image()
--				image.set_from_file("data/img/europe.png")
-+				image.set_from_file("%%DATADIR%%/img/europe.png")
- 				table.attach(image,2,3,1,2)
- 				frame2.add(table)
- 				box.pack_start(frame2)
-@@ -1408,7 +1408,7 @@
- 		self.context_id = self.statusbar.get_context_id("Info")
- 
- 		self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
--		gtk.window_set_default_icon_from_file("data/img/icon.png")
-+		gtk.window_set_default_icon_from_file("%%DATADIR%%/img/icon.png")
- 
- 	def main(self):
- 		#Window attributes.
-@@ -1536,7 +1536,7 @@
- 		container = gtk.EventBox()
- 		container.modify_bg(gtk.STATE_NORMAL,gtk.gdk.color_parse("white"))
- 		logo = gtk.Image()
--		logo.set_from_file("data/img/xgngeo.png")
-+		logo.set_from_file("%%DATADIR%%/img/xgngeo.png")
- 		logo.set_padding(25,2)
- 		container.add(logo)
- 		box.pack_start(container)
diff --git a/emulators/xgngeo/pkg-plist b/emulators/xgngeo/pkg-plist
index bcb075a3800..4a727377b5c 100644
--- a/emulators/xgngeo/pkg-plist
+++ b/emulators/xgngeo/pkg-plist
@@ -1,8 +1,31 @@
-bin/xgngeo.py
+bin/xgngeo_startup.py
+bin/xgngeo
+%%PYTHON_SITELIBDIR%%/xgngeo/__init__.py
+%%PYTHON_SITELIBDIR%%/xgngeo/command.py
+%%PYTHON_SITELIBDIR%%/xgngeo/configfile.py
+%%PYTHON_SITELIBDIR%%/xgngeo/emulator.py
+%%PYTHON_SITELIBDIR%%/xgngeo/history.py
+%%PYTHON_SITELIBDIR%%/xgngeo/rominfos.py
+%%PYTHON_SITELIBDIR%%/xgngeo/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xgngeo/command.pyc
+%%PYTHON_SITELIBDIR%%/xgngeo/configfile.pyc
+%%PYTHON_SITELIBDIR%%/xgngeo/emulator.pyc
+%%PYTHON_SITELIBDIR%%/xgngeo/history.pyc
+%%PYTHON_SITELIBDIR%%/xgngeo/rominfos.pyc
+%%PYTHON_SITELIBDIR%%/xgngeo/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xgngeo/command.pyo
+%%PYTHON_SITELIBDIR%%/xgngeo/configfile.pyo
+%%PYTHON_SITELIBDIR%%/xgngeo/emulator.pyo
+%%PYTHON_SITELIBDIR%%/xgngeo/history.pyo
+%%PYTHON_SITELIBDIR%%/xgngeo/rominfos.pyo
 %%PORTDOCS%%%%DOCSDIR%%/xgngeo-doc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/xgngeo-doc.txt
 %%DATADIR%%/img/chprod.png
 %%DATADIR%%/img/europe.png
+%%DATADIR%%/img/hotkey1.png
+%%DATADIR%%/img/hotkey2.png
+%%DATADIR%%/img/hotkey3.png
+%%DATADIR%%/img/hotkey4.png
 %%DATADIR%%/img/icon.png
 %%DATADIR%%/img/japan.png
 %%DATADIR%%/img/key_A.png
@@ -15,28 +38,20 @@ bin/xgngeo.py
 %%DATADIR%%/img/key_RIGHT.png
 %%DATADIR%%/img/key_START.png
 %%DATADIR%%/img/key_UP.png
+%%DATADIR%%/img/minilogo.png
 %%DATADIR%%/img/usa.png
 %%DATADIR%%/img/xgngeo.png
+%%DATADIR%%/rominfos.dtd
+%%DATADIR%%/rominfos.xml
+%%DATADIR%%/LICENSE.txt
+%%DATADIR%%/doc/xgngeo-doc.txt
 share/locale/es/LC_MESSAGES/xgngeo.mo
-share/locale/es/LC_MESSAGES/xgngeo.po
+share/locale/de/LC_MESSAGES/xgngeo.mo
 share/locale/fr/LC_MESSAGES/xgngeo.mo
-share/locale/fr/LC_MESSAGES/xgngeo.po
 share/locale/pl/LC_MESSAGES/xgngeo.mo
-share/locale/pl/LC_MESSAGES/xgngeo.po
-share/locale/pt_BR/LC_MESSAGES/xgngeo.po
-%%DATADIR%%/py/command.py
-%%DATADIR%%/py/configfile.py
-%%DATADIR%%/py/history.py
-%%DATADIR%%/py/rominfos.py
-%%DATADIR%%/py/romrcfile.py
-%%DATADIR%%/py/romrcfile.pyc
-%%DATADIR%%/py/command.pyc
-%%DATADIR%%/py/configfile.pyc
-%%DATADIR%%/py/history.pyc
-%%DATADIR%%/py/rominfos.pyc
-%%DATADIR%%/rominfos.dtd
-%%DATADIR%%/rominfos.xml
+share/locale/pt_BR/LC_MESSAGES/xgngeo.mo
+@dirrmtry %%DATADIR%%/img
+@dirrmtry %%DATADIR%%/doc
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/img
-@dirrm %%DATADIR%%/py
-@dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/xgngeo