aboutsummaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
authorBeech Rintoul <beech@FreeBSD.org>2007-07-12 07:19:11 +0000
committerBeech Rintoul <beech@FreeBSD.org>2007-07-12 07:19:11 +0000
commite3e1a15c9c1f83f350e19ed15bf26a17c57d3792 (patch)
tree8e54ddde503d7701ced17949fbb6e8e8570b995a /ftp
parent8c23dbd26005441c1869fd652cc6e8e7b541d213 (diff)
downloadports-e3e1a15c9c1f83f350e19ed15bf26a17c57d3792.tar.gz
ports-e3e1a15c9c1f83f350e19ed15bf26a17c57d3792.zip
- Fix extra-patch-mod-codeconv
- Bump portrevision PR: ports/114502 Reported by: Oleg Gawriloff <barzog@telecom.by> Approved by: sat (mentor)
Notes
Notes: svn path=/head/; revision=195452
Diffstat (limited to 'ftp')
-rw-r--r--ftp/proftpd-devel/Makefile3
-rw-r--r--ftp/proftpd-devel/files/extra-patch-mod-codeconv9
-rw-r--r--ftp/proftpd/Makefile3
-rw-r--r--ftp/proftpd/files/extra-patch-mod-codeconv9
4 files changed, 12 insertions, 12 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index b6519bda430c..9581a01e538e 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= proftpd
DISTVERSION= 1.3.1rc3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -215,6 +215,7 @@ MODULES:=${MODULES}:mod_quotatab_sql
USE_ICONV= YES
MODULES:=${MODULES}:mod_codeconv
INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
+CONFIGURE_ARGS+= --disable-sendfile
PROFTPD_LIBS+= -liconv -L${LOCALBASE}/lib
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mod-codeconv
.endif
diff --git a/ftp/proftpd-devel/files/extra-patch-mod-codeconv b/ftp/proftpd-devel/files/extra-patch-mod-codeconv
index e95f5889dc39..a7de92ca3ff6 100644
--- a/ftp/proftpd-devel/files/extra-patch-mod-codeconv
+++ b/ftp/proftpd-devel/files/extra-patch-mod-codeconv
@@ -1,6 +1,6 @@
diff -urN ./modules/mod_codeconv.c .-iconv/modules/mod_codeconv.c
--- ./modules/mod_codeconv.c 1970-01-01 09:00:00.000000000 +0900
-+++ .-iconv/modules/mod_codeconv.c 2004-09-25 21:44:05.000000000 +0900
++++ modules/mod_codeconv.c 2004-09-25 21:44:05.000000000 +0900
@@ -0,0 +1,229 @@
+/*
+ * ProFTPD: mod_codeconv -- local <-> remote charset conversion
@@ -233,7 +233,7 @@ diff -urN ./modules/mod_codeconv.c .-iconv/modules/mod_codeconv.c
+};
diff -urN ./modules/mod_df.c .-iconv/modules/mod_df.c
--- ./modules/mod_df.c 1970-01-01 09:00:00.000000000 +0900
-+++ .-iconv/modules/mod_df.c 2004-09-25 21:43:57.000000000 +0900
++++ modules/mod_df.c 2004-09-25 21:43:57.000000000 +0900
@@ -0,0 +1,127 @@
+/*
+ * ProFTPD: mod_df -- &#1077;&#9567;&#1077;&#1075;&#1077;&#9571;&#1077;&#1087;&#9570;&#1111;&#1076;&#1085;&#9552;&#9566;&#9580;&#9568;&#9472;&#9568;&#9500;&#9580;&#1077;&#1090;&#1077;&#9557;&#1077;&#1093;&#1073;&#9565;&#1077;&#1099;
@@ -363,7 +363,7 @@ diff -urN ./modules/mod_df.c .-iconv/modules/mod_df.c
+
+};
--- ./modules/mod_ls.c Sat Dec 16 01:25:31 2006
-+++ .-iconv/modules/mod_ls.c Tue Jan 23 15:43:20 2007
++++ modules/mod_ls.c Tue Jan 23 15:43:20 2007
@@ -244,12 +244,15 @@
return res;
}
@@ -396,7 +396,7 @@ diff -urN ./modules/mod_df.c .-iconv/modules/mod_df.c
res = pr_data_xfer(listbuf, strlen(listbuf));
diff -urN ./src/netio.c .-iconv/src/netio.c
--- ./src/netio.c 2004-06-16 01:45:21.000000000 +0900
-+++ .-iconv/src/netio.c 2004-09-25 21:42:59.000000000 +0900
++++ src/netio.c 2004-09-25 21:42:59.000000000 +0900
@@ -467,9 +467,12 @@
return -1;
}
@@ -423,4 +423,3 @@ diff -urN ./src/netio.c .-iconv/src/netio.c
+
return pr_netio_write(nstrm, buf, strlen(buf));
}
-
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index b6519bda430c..9581a01e538e 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= proftpd
DISTVERSION= 1.3.1rc3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -215,6 +215,7 @@ MODULES:=${MODULES}:mod_quotatab_sql
USE_ICONV= YES
MODULES:=${MODULES}:mod_codeconv
INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
+CONFIGURE_ARGS+= --disable-sendfile
PROFTPD_LIBS+= -liconv -L${LOCALBASE}/lib
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mod-codeconv
.endif
diff --git a/ftp/proftpd/files/extra-patch-mod-codeconv b/ftp/proftpd/files/extra-patch-mod-codeconv
index e95f5889dc39..a7de92ca3ff6 100644
--- a/ftp/proftpd/files/extra-patch-mod-codeconv
+++ b/ftp/proftpd/files/extra-patch-mod-codeconv
@@ -1,6 +1,6 @@
diff -urN ./modules/mod_codeconv.c .-iconv/modules/mod_codeconv.c
--- ./modules/mod_codeconv.c 1970-01-01 09:00:00.000000000 +0900
-+++ .-iconv/modules/mod_codeconv.c 2004-09-25 21:44:05.000000000 +0900
++++ modules/mod_codeconv.c 2004-09-25 21:44:05.000000000 +0900
@@ -0,0 +1,229 @@
+/*
+ * ProFTPD: mod_codeconv -- local <-> remote charset conversion
@@ -233,7 +233,7 @@ diff -urN ./modules/mod_codeconv.c .-iconv/modules/mod_codeconv.c
+};
diff -urN ./modules/mod_df.c .-iconv/modules/mod_df.c
--- ./modules/mod_df.c 1970-01-01 09:00:00.000000000 +0900
-+++ .-iconv/modules/mod_df.c 2004-09-25 21:43:57.000000000 +0900
++++ modules/mod_df.c 2004-09-25 21:43:57.000000000 +0900
@@ -0,0 +1,127 @@
+/*
+ * ProFTPD: mod_df -- &#1077;&#9567;&#1077;&#1075;&#1077;&#9571;&#1077;&#1087;&#9570;&#1111;&#1076;&#1085;&#9552;&#9566;&#9580;&#9568;&#9472;&#9568;&#9500;&#9580;&#1077;&#1090;&#1077;&#9557;&#1077;&#1093;&#1073;&#9565;&#1077;&#1099;
@@ -363,7 +363,7 @@ diff -urN ./modules/mod_df.c .-iconv/modules/mod_df.c
+
+};
--- ./modules/mod_ls.c Sat Dec 16 01:25:31 2006
-+++ .-iconv/modules/mod_ls.c Tue Jan 23 15:43:20 2007
++++ modules/mod_ls.c Tue Jan 23 15:43:20 2007
@@ -244,12 +244,15 @@
return res;
}
@@ -396,7 +396,7 @@ diff -urN ./modules/mod_df.c .-iconv/modules/mod_df.c
res = pr_data_xfer(listbuf, strlen(listbuf));
diff -urN ./src/netio.c .-iconv/src/netio.c
--- ./src/netio.c 2004-06-16 01:45:21.000000000 +0900
-+++ .-iconv/src/netio.c 2004-09-25 21:42:59.000000000 +0900
++++ src/netio.c 2004-09-25 21:42:59.000000000 +0900
@@ -467,9 +467,12 @@
return -1;
}
@@ -423,4 +423,3 @@ diff -urN ./src/netio.c .-iconv/src/netio.c
+
return pr_netio_write(nstrm, buf, strlen(buf));
}
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 13:42:04 +0000