summaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2002-12-23 07:03:27 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2002-12-23 07:03:27 +0800
commiteb5ff14f4f3463d764ce6ec9f105659a99e83d62 (patch)
tree5618ab682a3e732b3efea1053555757ed65e17e9 /editors
parentdf52019b51ab4d9d29338e9784563f4d31de0f83 (diff)
downloadmarcuscom-ports-eb5ff14f4f3463d764ce6ec9f105659a99e83d62.tar
marcuscom-ports-eb5ff14f4f3463d764ce6ec9f105659a99e83d62.tar.gz
marcuscom-ports-eb5ff14f4f3463d764ce6ec9f105659a99e83d62.tar.bz2
marcuscom-ports-eb5ff14f4f3463d764ce6ec9f105659a99e83d62.tar.lz
marcuscom-ports-eb5ff14f4f3463d764ce6ec9f105659a99e83d62.tar.xz
marcuscom-ports-eb5ff14f4f3463d764ce6ec9f105659a99e83d62.tar.zst
marcuscom-ports-eb5ff14f4f3463d764ce6ec9f105659a99e83d62.zip
Update to 2.1.5.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@325 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'editors')
-rw-r--r--editors/gedit2/Makefile4
-rw-r--r--editors/gedit2/distinfo2
-rw-r--r--editors/gedit2/files/patch-configure18
3 files changed, 17 insertions, 7 deletions
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 0a3e6c9f6..078ec7500 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gedit2
-PORTVERSION= 2.1.4
+PORTVERSION= 2.1.5
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.1
@@ -38,5 +38,7 @@ MAN1= gedit.1
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+ ${WRKSRC}/po/Makefile.in.in
.include <bsd.port.mk>
diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo
index 72f025eca..56e28ac1e 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gedit-2.1.4.tar.bz2) = 89454c020d1e200503b9b2f5cec5d93f
+MD5 (gnome2/gedit-2.1.5.tar.bz2) = 91fb2fbe39b000e45d1df1f7e63382f2
diff --git a/editors/gedit2/files/patch-configure b/editors/gedit2/files/patch-configure
index 3d3a48a1f..843cf5e98 100644
--- a/editors/gedit2/files/patch-configure
+++ b/editors/gedit2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Mon Dec 9 17:24:48 2002
-+++ configure Tue Dec 10 22:17:37 2002
-@@ -7274,6 +7274,7 @@
+--- configure.orig Tue Dec 17 05:27:57 2002
++++ configure Sun Dec 22 17:31:25 2002
+@@ -7270,6 +7270,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,10 +8,18 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10761,10 +10762,10 @@
+@@ -10758,17 +10759,17 @@
+ if test "x${prefix}" = "xNONE"; then
+
+ cat >>confdefs.h <<_ACEOF
+-#define PIXMAPS_DIR "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
++
+ _ACEOF
+
pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
else
- cat >>confdefs.h <<_ACEOF
+
+ cat >>confdefs.h <<_ACEOF
-#define PIXMAPS_DIR "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
+#define PIXMAPS_DIR "${datadir}/pixmaps"
_ACEOF