[Midnightbsd-cvs] mports [21183] trunk/converters: add php 7 ports, remove 5.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Mar 15 16:40:19 EDT 2016
Revision: 21183
http://svnweb.midnightbsd.org/mports/?rev=21183
Author: laffer1
Date: 2016-03-15 16:40:19 -0400 (Tue, 15 Mar 2016)
Log Message:
-----------
add php 7 ports, remove 5.4
Modified Paths:
--------------
trunk/converters/Makefile
trunk/converters/libiconv/Makefile
trunk/converters/libiconv/pkg-plist
Added Paths:
-----------
trunk/converters/libiconv/files/patch-include-iconv.h.in
trunk/converters/php70-iconv/
trunk/converters/php70-iconv/Makefile
trunk/converters/php70-mbstring/
trunk/converters/php70-mbstring/Makefile
trunk/converters/php70-mbstring/files/
trunk/converters/php70-mbstring/files/patch-config.m4
trunk/converters/php70-recode/
trunk/converters/php70-recode/Makefile
Removed Paths:
-------------
trunk/converters/php5-bsdconv/
trunk/converters/php5-iconv/
trunk/converters/php5-mbstring/
trunk/converters/php5-recode/
Modified: trunk/converters/Makefile
===================================================================
--- trunk/converters/Makefile 2016-03-15 20:39:12 UTC (rev 21182)
+++ trunk/converters/Makefile 2016-03-15 20:40:19 UTC (rev 21183)
@@ -28,10 +28,6 @@
SUBDIR += p5-Unicode-MapUTF8
SUBDIR += p5-Unicode-String
SUBDIR += pecl-fribidi
-SUBDIR += php5-bsdconv
-SUBDIR += php5-iconv
-SUBDIR += php5-mbstring
-SUBDIR += php5-recode
SUBDIR += php55-iconv
SUBDIR += php55-mbstring
SUBDIR += php55-recode
@@ -38,6 +34,9 @@
SUBDIR += php56-iconv
SUBDIR += php56-mbstring
SUBDIR += php56-recode
+SUBDIR += php70-iconv
+SUBDIR += php70-mbstring
+SUBDIR += php70-recode
SUBDIR += psiconv
SUBDIR += recode
SUBDIR += ruby-dump.rb
Modified: trunk/converters/libiconv/Makefile
===================================================================
--- trunk/converters/libiconv/Makefile 2016-03-15 20:39:12 UTC (rev 21182)
+++ trunk/converters/libiconv/Makefile 2016-03-15 20:40:19 UTC (rev 21183)
@@ -2,7 +2,7 @@
PORTNAME= libiconv
PORTVERSION= 1.14
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= converters devel
MASTER_SITES= GNU
@@ -13,10 +13,9 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static \
- --without-libintl-prefix \
- --docdir=${DOCSDIR}
-CONFIGURE_ENV= am_cv_func_iconv="yes" \
- am_cv_proto_iconv_arg1="const"
+ --disable-nls \
+ --docdir=${DOCSDIR} \
+ am_cv_func_iconv=no
INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE= yes
USES= libtool
@@ -49,7 +48,6 @@
${WRKSRC}/preload/configure
post-install:
- ${RM} ${STAGEDIR}${PREFIX}/lib/*.la
${LN} -s libiconv.so.3 ${PREFIX}/lib/libiconv.so.2
.include <bsd.port.mk>
Added: trunk/converters/libiconv/files/patch-include-iconv.h.in
===================================================================
--- trunk/converters/libiconv/files/patch-include-iconv.h.in (rev 0)
+++ trunk/converters/libiconv/files/patch-include-iconv.h.in 2016-03-15 20:40:19 UTC (rev 21183)
@@ -0,0 +1,70 @@
+--- include/iconv.h.in.orig 2011-08-07 17:48:03 UTC
++++ include/iconv.h.in
+@@ -21,8 +21,10 @@
+ #ifndef _LIBICONV_H
+ #define _LIBICONV_H
+
++#ifndef LIBICONV_PLUG
+ #define _LIBICONV_VERSION 0x010E /* version number: (major<<8) + minor */
+ extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
++#endif
+
+ /* We would like to #include any system header file which could define
+ iconv_t, 1. in order to eliminate the risk that the user gets compilation
+@@ -94,7 +96,6 @@ extern int iconv_close (iconv_t cd);
+ #endif
+
+
+-#ifndef LIBICONV_PLUG
+
+ /* Nonstandard extensions. */
+
+@@ -127,12 +128,16 @@ typedef struct {
+ /* Allocates descriptor for code conversion from encoding ‘fromcode’ to
+ encoding ‘tocode’ into preallocated memory. Returns an error indicator
+ (0 or -1 with errno set). */
++#ifndef LIBICONV_PLUG
+ #define iconv_open_into libiconv_open_into
++#endif
+ extern int iconv_open_into (const char* tocode, const char* fromcode,
+ iconv_allocation_t* resultp);
+
+ /* Control of attributes. */
++#ifndef LIBICONV_PLUG
+ #define iconvctl libiconvctl
++#endif
+ extern int iconvctl (iconv_t cd, int request, void* argument);
+
+ /* Hook performed after every successful conversion of a Unicode character. */
+@@ -212,7 +217,9 @@ struct iconv_fallbacks {
+ #define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks *argument */
+
+ /* Listing of locale independent encodings. */
++#ifndef LIBICONV_PLUG
+ #define iconvlist libiconvlist
++#endif
+ extern void iconvlist (int (*do_one) (unsigned int namescount,
+ const char * const * names,
+ void* data),
+@@ -224,6 +231,7 @@ extern const char * iconv_canonicalize (
+
+ /* Support for relocatable packages. */
+
++#ifndef LIBICONV_PLUG
+ /* Sets the original and the current installation prefix of the package.
+ Relocation simply replaces a pathname starting with the original prefix
+ by the corresponding pathname with the current prefix instead. Both
+@@ -231,12 +239,12 @@ extern const char * iconv_canonicalize (
+ instead of "/"). */
+ extern void libiconv_set_relocation_prefix (const char *orig_prefix,
+ const char *curr_prefix);
++#endif
+
+ #ifdef __cplusplus
+ }
+ #endif
+
+-#endif
+
+
+ #endif /* _LIBICONV_H */
Property changes on: trunk/converters/libiconv/files/patch-include-iconv.h.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/converters/libiconv/pkg-plist
===================================================================
--- trunk/converters/libiconv/pkg-plist 2016-03-15 20:39:12 UTC (rev 21182)
+++ trunk/converters/libiconv/pkg-plist 2016-03-15 20:40:19 UTC (rev 21183)
@@ -6,8 +6,10 @@
lib/libcharset.a
lib/libcharset.so
lib/libcharset.so.1
+lib/libcharset.so.1.0.0
lib/libiconv.a
lib/libiconv.so
+lib/libiconv.so.2
lib/libiconv.so.3
lib/libiconv.so.3.0.0
man/man1/iconv.1.gz
@@ -22,4 +24,3 @@
%%PORTDOCS%%%%DOCSDIR%%/iconv_open.3.html
%%PORTDOCS%%%%DOCSDIR%%/iconv_open_into.3.html
%%PORTDOCS%%%%DOCSDIR%%/iconvctl.3.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
Added: trunk/converters/php70-iconv/Makefile
===================================================================
--- trunk/converters/php70-iconv/Makefile (rev 0)
+++ trunk/converters/php70-iconv/Makefile 2016-03-15 20:40:19 UTC (rev 21183)
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale at FreeBSD.org>
+# $FreeBSD: head/converters/php70-iconv/Makefile 408932 2016-02-15 14:34:26Z miwi $
+
+CATEGORIES= converters
+
+MASTERDIR= ${.CURDIR}/../../lang/php70
+
+PKGNAMESUFFIX= -iconv
+
+.include "${MASTERDIR}/Makefile"
Property changes on: trunk/converters/php70-iconv/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/converters/php70-mbstring/Makefile
===================================================================
--- trunk/converters/php70-mbstring/Makefile (rev 0)
+++ trunk/converters/php70-mbstring/Makefile 2016-03-15 20:40:19 UTC (rev 21183)
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale at FreeBSD.org>
+# $FreeBSD: head/converters/php70-mbstring/Makefile 408932 2016-02-15 14:34:26Z miwi $
+
+CATEGORIES= converters
+
+MASTERDIR= ${.CURDIR}/../../lang/php70
+
+PKGNAMESUFFIX= -mbstring
+
+.include "${MASTERDIR}/Makefile"
Property changes on: trunk/converters/php70-mbstring/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/converters/php70-mbstring/files/patch-config.m4
===================================================================
--- trunk/converters/php70-mbstring/files/patch-config.m4 (rev 0)
+++ trunk/converters/php70-mbstring/files/patch-config.m4 2016-03-15 20:40:19 UTC (rev 21183)
@@ -0,0 +1,51 @@
+--- config.m4.orig 2009-11-25 02:30:06.000000000 +0100
++++ config.m4 2010-04-12 09:59:54.000000000 +0200
+@@ -43,6 +43,30 @@
+ PHP_ADD_INCLUDE([$ext_builddir/$dir])
+ done
+
++ dnl This is PECL build, check if bundled PCRE library is used
++ old_CPPFLAGS=$CPPFLAGS
++ CPPFLAGS=$INCLUDES
++ AC_EGREP_CPP(yes,[
++#include <main/php_config.h>
++#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
++yes
++#endif
++ ],[
++ PHP_PCRE_REGEX=yes
++ ],[
++ AC_EGREP_CPP(yes,[
++#include <main/php_config.h>
++#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
++yes
++#endif
++ ],[
++ PHP_PCRE_REGEX=pecl
++ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
++ ],[
++ PHP_PCRE_REGEX=no
++ ])
++ ])
++
+ if test "$ext_shared" = "no"; then
+ PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES)
+ out="php_config.h"
+@@ -80,7 +104,6 @@
+ int foo(int x, ...) {
+ va_list va;
+ va_start(va, x);
+- va_arg(va, int);
+ va_arg(va, char *);
+ va_arg(va, double);
+ return 0;
+@@ -347,6 +370,9 @@
+ [ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
+ If DIR is not set, the bundled oniguruma will be used], no, no)
+
++PHP_ARG_WITH(pcre-dir, pcre install prefix,
++[ --with-pcre-dir MBSTRING: pcre install prefix], no, no)
++
+ if test "$PHP_MBSTRING" != "no"; then
+ AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])
+
Property changes on: trunk/converters/php70-mbstring/files/patch-config.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/converters/php70-recode/Makefile
===================================================================
--- trunk/converters/php70-recode/Makefile (rev 0)
+++ trunk/converters/php70-recode/Makefile 2016-03-15 20:40:19 UTC (rev 21183)
@@ -0,0 +1,10 @@
+# Created by: Alex Dupre <ale at FreeBSD.org>
+# $FreeBSD: head/converters/php70-recode/Makefile 408932 2016-02-15 14:34:26Z miwi $
+
+CATEGORIES= converters
+
+MASTERDIR= ${.CURDIR}/../../lang/php70
+
+PKGNAMESUFFIX= -recode
+
+.include "${MASTERDIR}/Makefile"
Property changes on: trunk/converters/php70-recode/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list