aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
authorvanilla <vanilla@FreeBSD.org>2007-12-12 11:45:10 +0800
committervanilla <vanilla@FreeBSD.org>2007-12-12 11:45:10 +0800
commit8551a48044f69482961aa2d734e7aee75760cd84 (patch)
treed011019303b7d199c7fd6e27a63380130d6d3421 /x11-wm
parentf06be823bde54b5993edd5504aa0c780c4440357 (diff)
downloadfreebsd-ports-gnome-8551a48044f69482961aa2d734e7aee75760cd84.tar.gz
freebsd-ports-gnome-8551a48044f69482961aa2d734e7aee75760cd84.tar.zst
freebsd-ports-gnome-8551a48044f69482961aa2d734e7aee75760cd84.zip
1: add a patch to get rid of compile warning.
2: remove unneeded patch. PR: ports/117706, ports/117794 Submitted by: Pietro Cerutti <gahr.at.gahr.ch>
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/e16/Makefile6
-rw-r--r--x11-wm/e16/files/patch-e_gen_menu11
-rw-r--r--x11-wm/e16/files/patch-src_lang.c44
-rw-r--r--x11-wm/enlightenment/Makefile6
-rw-r--r--x11-wm/enlightenment/files/patch-e_gen_menu11
-rw-r--r--x11-wm/enlightenment/files/patch-src_lang.c44
6 files changed, 90 insertions, 32 deletions
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 8cc1650e0e6e..9e56a5ec7fa5 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.8.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -61,8 +61,4 @@ PLIST_FILES= share/locale/bg/LC_MESSAGES/e16.mo \
CONFIGURE_ARGS+=--disable-nls
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
- -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/scripts/e_gen_menu
-
.include <bsd.port.mk>
diff --git a/x11-wm/e16/files/patch-e_gen_menu b/x11-wm/e16/files/patch-e_gen_menu
deleted file mode 100644
index b1eb1942b11a..000000000000
--- a/x11-wm/e16/files/patch-e_gen_menu
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/e_gen_menu.orig Sat Jan 13 20:34:49 2007
-+++ scripts/e_gen_menu Sun Mar 11 11:26:16 2007
-@@ -25,7 +25,7 @@
- ##############################################################################
-
- # Likely prefixes
--$Prefixes = "/usr/local:/usr:/opt:/opt/kde:$ENV{'KDEDIR'}";
-+$Prefixes = "/usr/local:%%X11BASE%%:/usr:/opt:/opt/kde:$ENV{'KDEDIR'}";
- $Prefixes = "$Prefixes:/opt/kde3:/opt/gnome"; # SUSE
- $Prefixes = RemoveDuplcates($Prefixes);
-
diff --git a/x11-wm/e16/files/patch-src_lang.c b/x11-wm/e16/files/patch-src_lang.c
new file mode 100644
index 000000000000..af4f7b3377d7
--- /dev/null
+++ b/x11-wm/e16/files/patch-src_lang.c
@@ -0,0 +1,44 @@
+--- src/lang.c.orig 2007-10-06 15:16:39.000000000 +0800
++++ src/lang.c 2007-12-12 11:37:30.309489868 +0800
+@@ -53,10 +53,11 @@
+ Eiconv(iconv_t icd, const char *txt, size_t len)
+ {
+ char buf[4096];
+- char *pi, *po;
++ const char *pi;
++ char *po;
+ size_t err, ni, no;
+
+- pi = (char *)txt;
++ pi = txt;
+ po = buf;
+ ni = (len > 0) ? len : strlen(txt);
+ if (!icd)
+@@ -202,11 +203,12 @@
+ EwcStrToWcs(const char *str, int len, wchar_t * wcs, int wcl)
+ {
+ #if HAVE_ICONV
+- char *pi, *po;
++ const char *pi;
++ char *po;
+ size_t ni, no, rc;
+ char buf[4096];
+
+- pi = (char *)str;
++ pi = str;
+ ni = len;
+
+ if (!wcs)
+@@ -242,10 +244,10 @@
+ EwcWcsToStr(const wchar_t * wcs, int wcl, char *str, int len)
+ {
+ #if HAVE_ICONV
+- char *pi;
++ const char *pi;
+ size_t ni, no, rc;
+
+- pi = (char *)wcs;
++ pi = (const char *)wcs;
+ ni = wcl * sizeof(wchar_t);
+ no = len;
+ rc = iconv(iconv_cd_wcs2str, &pi, &ni, &str, &no);
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 8cc1650e0e6e..9e56a5ec7fa5 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -7,7 +7,7 @@
PORTNAME= enlightenment
PORTVERSION= 0.16.8.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -61,8 +61,4 @@ PLIST_FILES= share/locale/bg/LC_MESSAGES/e16.mo \
CONFIGURE_ARGS+=--disable-nls
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
- -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/scripts/e_gen_menu
-
.include <bsd.port.mk>
diff --git a/x11-wm/enlightenment/files/patch-e_gen_menu b/x11-wm/enlightenment/files/patch-e_gen_menu
deleted file mode 100644
index b1eb1942b11a..000000000000
--- a/x11-wm/enlightenment/files/patch-e_gen_menu
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/e_gen_menu.orig Sat Jan 13 20:34:49 2007
-+++ scripts/e_gen_menu Sun Mar 11 11:26:16 2007
-@@ -25,7 +25,7 @@
- ##############################################################################
-
- # Likely prefixes
--$Prefixes = "/usr/local:/usr:/opt:/opt/kde:$ENV{'KDEDIR'}";
-+$Prefixes = "/usr/local:%%X11BASE%%:/usr:/opt:/opt/kde:$ENV{'KDEDIR'}";
- $Prefixes = "$Prefixes:/opt/kde3:/opt/gnome"; # SUSE
- $Prefixes = RemoveDuplcates($Prefixes);
-
diff --git a/x11-wm/enlightenment/files/patch-src_lang.c b/x11-wm/enlightenment/files/patch-src_lang.c
new file mode 100644
index 000000000000..af4f7b3377d7
--- /dev/null
+++ b/x11-wm/enlightenment/files/patch-src_lang.c
@@ -0,0 +1,44 @@
+--- src/lang.c.orig 2007-10-06 15:16:39.000000000 +0800
++++ src/lang.c 2007-12-12 11:37:30.309489868 +0800
+@@ -53,10 +53,11 @@
+ Eiconv(iconv_t icd, const char *txt, size_t len)
+ {
+ char buf[4096];
+- char *pi, *po;
++ const char *pi;
++ char *po;
+ size_t err, ni, no;
+
+- pi = (char *)txt;
++ pi = txt;
+ po = buf;
+ ni = (len > 0) ? len : strlen(txt);
+ if (!icd)
+@@ -202,11 +203,12 @@
+ EwcStrToWcs(const char *str, int len, wchar_t * wcs, int wcl)
+ {
+ #if HAVE_ICONV
+- char *pi, *po;
++ const char *pi;
++ char *po;
+ size_t ni, no, rc;
+ char buf[4096];
+
+- pi = (char *)str;
++ pi = str;
+ ni = len;
+
+ if (!wcs)
+@@ -242,10 +244,10 @@
+ EwcWcsToStr(const wchar_t * wcs, int wcl, char *str, int len)
+ {
+ #if HAVE_ICONV
+- char *pi;
++ const char *pi;
+ size_t ni, no, rc;
+
+- pi = (char *)wcs;
++ pi = (const char *)wcs;
+ ni = wcl * sizeof(wchar_t);
+ no = len;
+ rc = iconv(iconv_cd_wcs2str, &pi, &ni, &str, &no);
generated by cgit (git 2.34.1) at 2024-12-21 17:31:44 +0800