summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-02-24 16:33:19 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-02-24 16:33:19 +0800
commit9561e02c477e91c26d8cba4c07d3785ecafad8d5 (patch)
tree6fdb18cd842dcff70409732ec2ccc1b9497610f9
parentab68668e24af24f0163690098482cb030e0914e9 (diff)
downloadmarcuscom-ports-9561e02c477e91c26d8cba4c07d3785ecafad8d5.tar.gz
marcuscom-ports-9561e02c477e91c26d8cba4c07d3785ecafad8d5.tar.zst
marcuscom-ports-9561e02c477e91c26d8cba4c07d3785ecafad8d5.zip
Remove some hacks for GNU strftime date formats, and add a conditional
reinplace instead. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3702 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11-toolkits/gal2/Makefile14
-rw-r--r--x11-toolkits/gal2/files/patch-po_da.po16
-rw-r--r--x11-toolkits/gal2/files/patch-po_zh_CN.po17
3 files changed, 13 insertions, 34 deletions
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 188880e10..14d3612d1 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gal2
PORTVERSION= 2.3.4
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.3
@@ -18,6 +19,7 @@ COMMENT= A collection of widgets taken from GNOME 2 gnumeric
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_PERL5= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui
@@ -29,4 +31,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
PLIST_SUB= VERSION="2.4" PORTVERSION=${PORTVERSION}
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
+ ( ${OSVERSION} < 503101 )
+.for po in da.po it.po zh_CN.po
+ @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
+.endfor
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/gal2/files/patch-po_da.po b/x11-toolkits/gal2/files/patch-po_da.po
deleted file mode 100644
index bcd97ad6f..000000000
--- a/x11-toolkits/gal2/files/patch-po_da.po
+++ /dev/null
@@ -1,16 +0,0 @@
---- po/da.po.orig Sat Dec 27 21:03:49 2003
-+++ po/da.po Sat Dec 27 21:04:00 2003
-@@ -46,11 +46,11 @@
-
- #: gal/e-table/e-cell-date.c:96
- msgid "%b %d %l:%M %p"
--msgstr "%-d. %b. %H:%M"
-+msgstr "%d. %b. %H:%M"
-
- #: gal/e-table/e-cell-date.c:98
- msgid "%b %d %Y"
--msgstr "%-d. %b %Y"
-+msgstr "%d. %b %Y"
-
- #: gal/e-table/e-cell-pixbuf.c:392
- msgid "Selected Column"
diff --git a/x11-toolkits/gal2/files/patch-po_zh_CN.po b/x11-toolkits/gal2/files/patch-po_zh_CN.po
deleted file mode 100644
index b3072e58b..000000000
--- a/x11-toolkits/gal2/files/patch-po_zh_CN.po
+++ /dev/null
@@ -1,17 +0,0 @@
---- po/zh_CN.po.orig Fri Mar 5 12:17:59 2004
-+++ po/zh_CN.po Sat Mar 6 03:08:34 2004
-@@ -51,12 +51,12 @@
- # gal/e-table/e-cell-date.c:104
- #: gal/e-table/e-cell-date.c:96
- msgid "%b %d %l:%M %p"
--msgstr "%-m月%-d日 %H:%M"
-+msgstr "%m月%d日 %H:%M"
-
- # gal/e-table/e-cell-date.c:106
- #: gal/e-table/e-cell-date.c:98
- msgid "%b %d %Y"
--msgstr "%Y年%-m月%-d日"
-+msgstr "%Y年%m月%d日"
-
- #: gal/e-table/e-cell-pixbuf.c:392
- msgid "Selected Column"