svn commit: r458635 - in head/www/resin3: . files

Muhammad Moinur Rahman bofh at FreeBSD.org
Wed Jan 10 12:54:10 UTC 2018 

Author: bofh
Date: Wed Jan 10 12:54:08 2018
New Revision: 458635
URL: https://svnweb.freebsd.org/changeset/ports/458635

Log:
  www/resin3: Update version 3.1.14=>3.1.15
  
  - Make patches makepatch compatible
  - Mark NO_ARCH

Added:
  head/www/resin3/files/patch-conf_resin.conf   (contents, props changed)
  head/www/resin3/files/patch-modules_c_src_apache2_Makefile.in   (contents, props changed)
  head/www/resin3/files/patch-modules_c_src_common_Makefile.in   (contents, props changed)
  head/www/resin3/files/patch-modules_c_src_common_cse.h   (contents, props changed)
Deleted:
  head/www/resin3/files/patch-apache2-Makefile.in
  head/www/resin3/files/patch-cse.h
  head/www/resin3/files/patch-modules-c-src-common-Makefile.in
Modified:
  head/www/resin3/Makefile
  head/www/resin3/distinfo
  head/www/resin3/files/patch-configure

Modified: head/www/resin3/Makefile
==============================================================================
--- head/www/resin3/Makefile	Wed Jan 10 12:43:23 2018	(r458634)
+++ head/www/resin3/Makefile	Wed Jan 10 12:54:08 2018	(r458635)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	resin
-PORTVERSION=	3.1.14
-PORTREVISION=	1
+PORTVERSION=	3.1.15
 CATEGORIES=	www java
 MASTER_SITES=	http://www.caucho.com/download/
 
@@ -19,7 +18,6 @@ GNU_CONFIGURE=	yes
 USES=		libtool python ssl
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-USE_LDCONFIG=	yes
 
 # Pass JAVA_HOME as determined by bsd.java.mk
 CONFIGURE_ARGS=	--with-java-home=${JAVA_HOME} \
@@ -57,6 +55,7 @@ LOG_FILE?=	/var/log/${APP_NAME}.log
 APXS?=		${LOCALBASE}/sbin/apxs
 SUB_FILES=	pkg-message resin3ctl
 USE_RC_SUBR=	resin3
+NO_ARCH=	yes
 
 .include <bsd.port.options.mk>
 

Modified: head/www/resin3/distinfo
==============================================================================
--- head/www/resin3/distinfo	Wed Jan 10 12:43:23 2018	(r458634)
+++ head/www/resin3/distinfo	Wed Jan 10 12:54:08 2018	(r458635)
@@ -1,2 +1,3 @@
-SHA256 (resin-3.1.14.tar.gz) = 6ad8218caa6f1d3333cbeaad2a6839691f211746578fbb3a45321246e211c348
-SIZE (resin-3.1.14.tar.gz) = 10276901
+TIMESTAMP = 1515447849
+SHA256 (resin-3.1.15.tar.gz) = de7de4b9631e1b63663a9935ce2c0dda95087e82a8220b7c3c1df1fd61550e62
+SIZE (resin-3.1.15.tar.gz) = 10294837

Added: head/www/resin3/files/patch-conf_resin.conf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/resin3/files/patch-conf_resin.conf	Wed Jan 10 12:54:08 2018	(r458635)
@@ -0,0 +1,11 @@
+--- conf/resin.conf.orig	2013-10-28 15:58:27 UTC
++++ conf/resin.conf
+@@ -237,7 +237,7 @@
+     </web-app-default>
+ 
+     <!-- includes the app-default for default web-app behavior -->
+-    <resin:import path="${resin.home}/conf/app-default.xml"/>
++    <resin:import path="/usr/local/etc/resin3/app-default.xml"/>
+ 
+     <!--
+        - Sample database pool configuration

Modified: head/www/resin3/files/patch-configure
==============================================================================
--- head/www/resin3/files/patch-configure	Wed Jan 10 12:43:23 2018	(r458634)
+++ head/www/resin3/files/patch-configure	Wed Jan 10 12:54:08 2018	(r458635)
@@ -1,6 +1,6 @@
---- configure.orig	2012-11-08 21:22:27.000000000 +0100
-+++ configure	2013-02-07 12:28:12.000000000 +0100
-@@ -12271,26 +12271,6 @@
+--- configure.orig	2014-10-13 18:18:58 UTC
++++ configure
+@@ -12456,26 +12456,6 @@ case "$target_os" in
    *freebsd*)
  	PROXY_LIBS='-lpthread'
          jni_os=freebsd

Added: head/www/resin3/files/patch-modules_c_src_apache2_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/resin3/files/patch-modules_c_src_apache2_Makefile.in	Wed Jan 10 12:54:08 2018	(r458635)
@@ -0,0 +1,14 @@
+--- modules/c/src/apache2/Makefile.in.orig	2013-10-28 16:37:54 UTC
++++ modules/c/src/apache2/Makefile.in
+@@ -36,11 +36,6 @@ mod_caucho.la	: $(OBJ_PICS)
+ 	$(CC) -c $(INCLUDES) $(CFLAGS) $<
+ 
+ install	: mod_caucho.la
+-	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
+-	- rm -f $(apache_libexec)/mod_caucho.la
+-	- rm -f $(apache_libexec)/mod_caucho.a
+-	sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \
+-	   -resin_home $(resin_home)
+ 
+ clean	:
+ 	- rm -r *.o *.lo *.la *.so .libs

Added: head/www/resin3/files/patch-modules_c_src_common_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/resin3/files/patch-modules_c_src_common_Makefile.in	Wed Jan 10 12:54:08 2018	(r458635)
@@ -0,0 +1,11 @@
+--- modules/c/src/common/Makefile.in.orig	2013-10-28 16:37:43 UTC
++++ modules/c/src/common/Makefile.in
+@@ -13,7 +13,7 @@ OBJ=stream.o config.o memory.o
+ OBJ_PICS=stream.lo config.lo memory.lo
+ INCLUDES=@INCLUDES@
+ 
+-all	: common.o $(OBJ_PICS)
++all	: $(OBJ) $(OBJ_PICS)
+ 
+ common.o	: $(OBJ)
+ 	$(LD) -r -o $@ $(OBJ)

Added: head/www/resin3/files/patch-modules_c_src_common_cse.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/resin3/files/patch-modules_c_src_common_cse.h	Wed Jan 10 12:54:08 2018	(r458635)
@@ -0,0 +1,12 @@
+--- modules/c/src/common/cse.h.orig	2013-10-28 16:37:43 UTC
++++ modules/c/src/common/cse.h
+@@ -367,6 +367,9 @@ resin_host_t *cse_match_host(config_t *config,
+ 			     const char *host, int port,
+ 			     time_t now);
+ 
++static resin_host_t * cse_match_host_impl(config_t *config, const char *host_name, int
++		port, time_t now);
++
+ cluster_srun_t *
+ cse_add_cluster_server(mem_pool_t *pool, cluster_t *cluster,
+ 		       const char *host, int port, const char *id,

More information about the svn-ports-all mailing list