6 files changed, 85 insertions, 55 deletions

diff --git a/sysutils/pyrenamer/Makefile b/sysutils/pyrenamer/Makefile
index aac8ba6243d6..0f2e44e1c470 100644
--- a/sysutils/pyrenamer/Makefile
+++ b/sysutils/pyrenamer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pyrenamer
-PORTVERSION=	0.2
+PORTVERSION=	0.3
 CATEGORIES=	sysutils python gnome
 MASTER_SITES=	http://www.infinicode.org/code/${PORTNAME}/
 
@@ -19,7 +19,10 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/eyeD3/__init__.py:${PORTSDIR}/audio/py-eyed3
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gconf2 pygtk2
 USE_PYTHON=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS README
 MAN1=		pyrenamer.1
diff --git a/sysutils/pyrenamer/distinfo b/sysutils/pyrenamer/distinfo
index a2403cd21a56..8ba8188ede96 100644
--- a/sysutils/pyrenamer/distinfo
+++ b/sysutils/pyrenamer/distinfo
@@ -1,3 +1,3 @@
-MD5 (pyrenamer-0.2.tar.gz) = c354ad2d9f8d1269483a2aadd6746605
-SHA256 (pyrenamer-0.2.tar.gz) = e5cff85a3096f05187b1a164e19fd149f0eda94bbdf6be484978c6cdccdc11d7
-SIZE (pyrenamer-0.2.tar.gz) = 133054
+MD5 (pyrenamer-0.3.tar.gz) = 251b3754a20990358e0750856d152cb8
+SHA256 (pyrenamer-0.3.tar.gz) = 8276a2173c5a5ecd01c600329c3511d1eaa9a13b1f043cd2bf7b7914f1264efb
+SIZE (pyrenamer-0.3.tar.gz) = 220007
diff --git a/sysutils/pyrenamer/files/patch-data_pyrenamer.glade b/sysutils/pyrenamer/files/patch-data_pyrenamer.glade
new file mode 100644
index 000000000000..31dba8c717ae
--- /dev/null
+++ b/sysutils/pyrenamer/files/patch-data_pyrenamer.glade
@@ -0,0 +1,35 @@
+--- data/pyrenamer.glade	2007/07/30 17:36:44	47
++++ data/pyrenamer.glade	2007/08/02 12:15:22	53
+@@ -396,8 +396,8 @@
+ Use {num} for adding 1, 2, 3... to file names
+ Use {num2} for 01, 02, 03.....
+ Use {num3} for 001, 002, 003...
+-Use {num-10} for 10, 11, 12...
+-Use {num2-10} for 010, 011, 012...
++Use {num+10} for 10, 11, 12...
++Use {num2+10} for 010, 011, 012...
+ Use {dir} for getting current dir
+ 
+ Some today date replacements:
+@@ -1359,8 +1359,8 @@
+ Use {num} for adding 1, 2, 3... to file names
+ Use {num2} for 01, 02, 03.....
+ Use {num3} for 001, 002, 003...
+-Use {num-10} for 10, 11, 12...
+-Use {num2-10} for 010, 011, 012...
++Use {num+10} for 10, 11, 12...
++Use {num2+10} for 010, 011, 012...
+ Use {dir} for getting current dir
+ 
+ Some today date replacements:
+@@ -1586,8 +1586,8 @@
+ Use {num} for adding 1, 2, 3... to file names
+ Use {num2} for 01, 02, 03.....
+ Use {num3} for 001, 002, 003...
+-Use {num-10} for 10, 11, 12...
+-Use {num2-10} for 010, 011, 012...
++Use {num+10} for 10, 11, 12...
++Use {num2+10} for 010, 011, 012...
+ Use {dir} for getting current dir
+ 
+ Some today date replacements:
diff --git a/sysutils/pyrenamer/files/patch-data_pyrenamer.schemas.in b/sysutils/pyrenamer/files/patch-data_pyrenamer.schemas.in
deleted file mode 100644
index 50d37c282d74..000000000000
--- a/sysutils/pyrenamer/files/patch-data_pyrenamer.schemas.in
+++ /dev/null
@@ -1,51 +0,0 @@
---- data/pyrenamer.schemas.in	2007/06/14 13:51:21	5
-+++ data/pyrenamer.schemas.in	2007/07/25 19:29:16	42
-@@ -19,7 +19,7 @@
-       <type>bool</type>
-       <default>0</default>
-       <locale name="C">
--         <short>IS the window maximized?</short>
-+         <short>Is the window maximized?</short>
-       </locale>
-     </schema>
-     
-@@ -28,6 +28,7 @@
-       <applyto>/apps/pyrenamer/pane_position</applyto>
-       <owner>pyrenamer</owner>
-       <type>int</type>
-+      <default>250</default>
-       <locale name="C">
-          <short>Position of the pane separator</short>
-       </locale>
-@@ -38,6 +39,7 @@
-       <applyto>/apps/pyrenamer/window_width</applyto>
-       <owner>pyrenamer</owner>
-       <type>int</type>
-+      <default>500</default>
-       <locale name="C">
-          <short>Window width</short>
-       </locale>
-@@ -48,6 +50,7 @@
-       <applyto>/apps/pyrenamer/window_height</applyto>
-       <owner>pyrenamer</owner>
-       <type>int</type>
-+      <default>500</default>
-       <locale name="C">
-          <short>Window height</short>
-       </locale>
-@@ -58,6 +61,7 @@
-       <applyto>/apps/pyrenamer/window_posx</applyto>
-       <owner>pyrenamer</owner>
-       <type>int</type>
-+      <default>0</default>
-       <locale name="C">
-          <short>X position of the window</short>
-       </locale>
-@@ -68,6 +72,7 @@
-       <applyto>/apps/pyrenamer/window_posy</applyto>
-       <owner>pyrenamer</owner>
-       <type>int</type>
-+      <default>0</default>
-       <locale name="C">
-          <short>Y position of the window</short>
-       </locale>
diff --git a/sysutils/pyrenamer/files/patch-src_pyrenamerfilefuncs.py b/sysutils/pyrenamer/files/patch-src_pyrenamerfilefuncs.py
new file mode 100644
index 000000000000..a6bf5a6673c7
--- /dev/null
+++ b/sysutils/pyrenamer/files/patch-src_pyrenamerfilefuncs.py
@@ -0,0 +1,41 @@
+--- src/pyrenamerfilefuncs.py	2007/07/30 11:27:53	45
++++ src/pyrenamerfilefuncs.py	2007/08/02 12:15:22	53
+@@ -242,7 +242,7 @@
+     repattern = re.compile(pattern)
+     try:
+         groups = repattern.search(name).groups()
+-    
++
+         for i in range(len(groups)):
+             newname = newname.replace('{'+`i+1`+'}',groups[i])
+     except:
+@@ -250,19 +250,24 @@
+     
+     # Replace {num} with item number.
+     # If {num2} the number will be 02
+-    # If {num3-10} the number will be 010
++    # If {num3+10} the number will be 010
+     count = `count`
+     cr = re.compile("{(num)([0-9]*)}"
+-                    "|{(num)([0-9]*)-([0-9]*)}")
++                    "|{(num)([0-9]*)(\+)([0-9]*)}")
+     try:
+         cg = cr.search(newname).groups()
+-        if len(cg) == 5:
++        if len(cg) == 6:
++            
+             if cg[0] == 'num':
++                # {num2}
+                 if cg[1] != '': count = count.zfill(int(cg[1]))
+                 newname = cr.sub(count, newname)
+-            if cg[2] == 'num':
+-                if cg[4] != '': count = str(int(count)+int(cg[4])-1)
++            
++            elif cg[2] == 'num' and cg[4] == '+':
++                # {num2+5}
++                if cg[5] != '': count = str(int(count)+int(cg[5]))
+                 if cg[3] != '': count = count.zfill(int(cg[3]))
++                
+         newname = cr.sub(count, newname)
+     except:
+         pass
diff --git a/sysutils/pyrenamer/pkg-plist b/sysutils/pyrenamer/pkg-plist
index ff3d989eb42d..af99ddad9ab8 100644
--- a/sysutils/pyrenamer/pkg-plist
+++ b/sysutils/pyrenamer/pkg-plist
@@ -30,6 +30,8 @@ share/applications/pyrenamer.desktop
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%EXAMPLESDIR%%/treefilebrowser_example.py
+share/locale/en/LC_MESSAGES/pyrenamer.mo
+share/locale/es/LC_MESSAGES/pyrenamer.mo
 %%DATADIR%%/pyrenamer.glade
 %%DATADIR%%/pyrenamer.png
 %%DATADIR%%/pyrenamer.svg