From nobody@FreeBSD.org  Thu Jul  4 08:21:46 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 3075D284
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  4 Jul 2013 08:21:46 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 2385B16BE
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  4 Jul 2013 08:21:46 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r648LkZg057696
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 4 Jul 2013 08:21:46 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r648LjSd057692;
	Thu, 4 Jul 2013 08:21:45 GMT
	(envelope-from nobody)
Message-Id: <201307040821.r648LjSd057692@oldred.freebsd.org>
Date: Thu, 4 Jul 2013 08:21:45 GMT
From: John Marino <draco@marino.st>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER] www/aws-demos: follow aws 3.1.0 update
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         180251
>Category:       ports
>Synopsis:       [MAINTAINER] www/aws-demos: follow aws 3.1.0 update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 04 08:30:00 UTC 2013
>Closed-Date:    Thu Jul 04 12:35:40 UTC 2013
>Last-Modified:  Thu Jul  4 12:40:00 UTC 2013
>Originator:     John Marino
>Release:        
>Organization:
>Environment:
>Description:
The aws-demos ports builds on www/aws and it must be updated too.

Related to ports/180242 (www/aws - that must be committed first)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- www/aws-demos/Makefile
+++ www/aws-demos/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: www/aws-demos/Makefile 316924 2013-04-30 12:19:00Z bapt $
 
 PORTNAME=	aws
-PORTVERSION=	2.10.0
+PORTVERSION=	3.1.0.0
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 PKGNAMESUFFIX=	-demos
@@ -26,8 +26,11 @@ OPTIONS_DEFINE=		SSL LDAP
 OPTIONS_DEFAULT=	SSL
 
 DEMO_DIRS+=	auth
+DEMO_DIRS+=	autobahn
+DEMO_DIRS+=	cert
 DEMO_DIRS+=	com
 DEMO_DIRS+=	dispatch
+DEMO_DIRS+=	dowload_manager
 DEMO_DIRS+=	hello_world
 DEMO_DIRS+=	hotplug
 DEMO_DIRS+=	jabber_demo
@@ -39,12 +42,14 @@ DEMO_DIRS+=	soap_vs
 DEMO_DIRS+=	split
 DEMO_DIRS+=	test_mail
 DEMO_DIRS+=	text_input
+DEMO_DIRS+=	upload
 DEMO_DIRS+=	vh_demo
 DEMO_DIRS+=	web_block
 DEMO_DIRS+=	web_block_ajax
 DEMO_DIRS+=	web_block_ajax_templates
 DEMO_DIRS+=	web_elements
 DEMO_DIRS+=	web_mail
+DEMO_DIRS+=	websockets
 DEMO_DIRS+=	wps
 DEMO_DIRS+=	ws
 DEMO_DIRS+=	zdemo
--- www/aws-demos/distinfo
+++ www/aws-demos/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aws-2.10.0.tar.bz2) = 010244129cc736d1ca415162dca79243fb243c3f0b12371a0ffc8a31c8b42f30
-SIZE (aws-2.10.0.tar.bz2) = 1384976
+SHA256 (aws-3.1.0.0.tar.bz2) = bb2896d81ab15f62a6fc8b7ae5c7191bf04ee9875e021ec0639cdbc435f8b8da
+SIZE (aws-3.1.0.0.tar.bz2) = 1529933
--- www/aws-demos/files/patch-demos_test__ldap_test__ldap.gpr
+++ www/aws-demos/files/patch-demos_test__ldap_test__ldap.gpr
@@ -1,11 +1,12 @@
---- demos/test_ldap/test_ldap.gpr.orig	2013-04-25 23:03:26.000000000 +0200
-+++ demos/test_ldap/test_ldap.gpr	2013-04-25 23:03:52.000000000 +0200
-@@ -42,7 +42,7 @@
+--- demos/test_ldap/test_ldap.gpr.orig	2013-07-03 01:11:54.000000000 +0000
++++ demos/test_ldap/test_ldap.gpr
+@@ -35,7 +35,8 @@ project Test_LDAP is
           when "Windows_NT" =>
              for Default_Switches ("Ada") use ("-lwldap32");
           when others =>
--            for Default_Switches ("Ada") use ("-lldap");
-+            for Default_Switches ("Ada") use ("-L@PREFIX@/lib", "-lldap");
+-            for Default_Switches ("Ada") use ("-lldap", "-llber");
++            for Default_Switches ("Ada") use ("-L@PREFIX@/lib",
++               "-lldap", "-llber");
        end case;
     end Linker;
  
--- www/aws-demos/pkg-plist
+++ www/aws-demos/pkg-plist
@@ -1,8 +1,11 @@
 %%OSSL%%%%EXAMPLESDIR%%/agent
 %%EXAMPLESDIR%%/auth
+%%EXAMPLESDIR%%/autobahn
+%%EXAMPLESDIR%%/cert
 %%EXAMPLESDIR%%/com_1
 %%EXAMPLESDIR%%/com_2
 %%EXAMPLESDIR%%/dispatch
+%%EXAMPLESDIR%%/download_manager
 %%EXAMPLESDIR%%/hello_world
 %%EXAMPLESDIR%%/hotplug
 @comment broken %%EXAMPLESDIR%%/interoplab_main
@@ -11,6 +14,7 @@
 %%EXAMPLESDIR%%/multiple_sessions
 %%EXAMPLESDIR%%/res_demo
 %%OSSL%%%%EXAMPLESDIR%%/runme
+%%EXAMPLESDIR%%/run.sh
 %%EXAMPLESDIR%%/soap_client
 %%EXAMPLESDIR%%/soap_cvs
 %%EXAMPLESDIR%%/soap_server
@@ -20,15 +24,18 @@
 %%LDAP%%%%EXAMPLESDIR%%/test_ldap
 %%EXAMPLESDIR%%/test_mail
 %%EXAMPLESDIR%%/text_input
+%%EXAMPLESDIR%%/upload
 %%EXAMPLESDIR%%/vh_demo
 %%EXAMPLESDIR%%/web_block
 %%EXAMPLESDIR%%/web_block_ajax
 %%EXAMPLESDIR%%/web_block_ajax_templates
 %%EXAMPLESDIR%%/web_elements
 %%EXAMPLESDIR%%/web_mail
+%%EXAMPLESDIR%%/websock
 %%EXAMPLESDIR%%/wps
 %%EXAMPLESDIR%%/ws
 @comment broken %%EXAMPLESDIR%%/wsdl_demo_client
 @comment broken %%EXAMPLESDIR%%/wsdl_demo_server
 %%EXAMPLESDIR%%/zdemo
 @dirrmtry %%EXAMPLESDIR%%
+@dirrmtry share/examples


>Release-Note:
>Audit-Trail:

From: John Marino <draco@marino.st>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180251: [MAINTAINER] www/aws-demos: follow aws 3.1.0 update
Date: Thu, 04 Jul 2013 12:26:10 +0200

 This update passes Redports cleanly x4:
 https://redports.org/buildarchive/20130704095754-67175/
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Thu Jul 4 12:22:04 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180251 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Thu Jul 4 12:35:39 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180251 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180251: commit references a PR
Date: Thu,  4 Jul 2013 12:35:50 +0000 (UTC)

 Author: wg
 Date: Thu Jul  4 12:35:35 2013
 New Revision: 322271
 URL: http://svnweb.freebsd.org/changeset/ports/322271
 
 Log:
   www/aws-demos: update to 3.1.0.0
   
   - Update to 3.1.0.0
   
   PR:		ports/180251
   Submitted by:	John Marino <draco@marino.st> (maintainer)
 
 Modified:
   head/www/aws-demos/Makefile
   head/www/aws-demos/distinfo
   head/www/aws-demos/files/patch-demos_test__ldap_test__ldap.gpr
   head/www/aws-demos/pkg-plist
 
 Modified: head/www/aws-demos/Makefile
 ==============================================================================
 --- head/www/aws-demos/Makefile	Thu Jul  4 12:31:07 2013	(r322270)
 +++ head/www/aws-demos/Makefile	Thu Jul  4 12:35:35 2013	(r322271)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	aws
 -PORTVERSION=	2.10.0
 +PORTVERSION=	3.1.0.0
  CATEGORIES=	www
  MASTER_SITES=	http://downloads.dragonlace.net/src/
  PKGNAMESUFFIX=	-demos
 @@ -12,11 +12,11 @@ COMMENT=	Adacore Ada Web Server demos
  
  BUILD_DEPENDS+=	gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \
  		xmlada>=3.2:${PORTSDIR}/textproc/xmlada \
 -		aws>=2.10:${PORTSDIR}/www/aws
 +		aws>=3.1:${PORTSDIR}/www/aws
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
 -USES+=		ada
 +USES=		ada
  
  CONF_ARGS=	PROCESSORS=1
  CONF_ARGS+=	GCC=ada
 @@ -26,8 +26,11 @@ OPTIONS_DEFINE=		SSL LDAP
  OPTIONS_DEFAULT=	SSL
  
  DEMO_DIRS+=	auth
 +DEMO_DIRS+=	autobahn
 +DEMO_DIRS+=	cert
  DEMO_DIRS+=	com
  DEMO_DIRS+=	dispatch
 +DEMO_DIRS+=	dowload_manager
  DEMO_DIRS+=	hello_world
  DEMO_DIRS+=	hotplug
  DEMO_DIRS+=	jabber_demo
 @@ -39,12 +42,14 @@ DEMO_DIRS+=	soap_vs
  DEMO_DIRS+=	split
  DEMO_DIRS+=	test_mail
  DEMO_DIRS+=	text_input
 +DEMO_DIRS+=	upload
  DEMO_DIRS+=	vh_demo
  DEMO_DIRS+=	web_block
  DEMO_DIRS+=	web_block_ajax
  DEMO_DIRS+=	web_block_ajax_templates
  DEMO_DIRS+=	web_elements
  DEMO_DIRS+=	web_mail
 +DEMO_DIRS+=	websockets
  DEMO_DIRS+=	wps
  DEMO_DIRS+=	ws
  DEMO_DIRS+=	zdemo
 @@ -90,7 +95,7 @@ do-build:
  .endfor
  
  do-install:
 -	${MKDIR} ${PREFIX}/share/examples/aws-demos
 +	@${MKDIR} ${PREFIX}/share/examples/aws-demos
  .for dd in ${DEMO_DIRS}
  	${FIND} ${WRKSRC}/demos/${dd} -type f -perm -0001 \
  	   -exec ${INSTALL} {} ${PREFIX}/share/examples/aws-demos/ \;
 
 Modified: head/www/aws-demos/distinfo
 ==============================================================================
 --- head/www/aws-demos/distinfo	Thu Jul  4 12:31:07 2013	(r322270)
 +++ head/www/aws-demos/distinfo	Thu Jul  4 12:35:35 2013	(r322271)
 @@ -1,2 +1,2 @@
 -SHA256 (aws-2.10.0.tar.bz2) = 010244129cc736d1ca415162dca79243fb243c3f0b12371a0ffc8a31c8b42f30
 -SIZE (aws-2.10.0.tar.bz2) = 1384976
 +SHA256 (aws-3.1.0.0.tar.bz2) = bb2896d81ab15f62a6fc8b7ae5c7191bf04ee9875e021ec0639cdbc435f8b8da
 +SIZE (aws-3.1.0.0.tar.bz2) = 1529933
 
 Modified: head/www/aws-demos/files/patch-demos_test__ldap_test__ldap.gpr
 ==============================================================================
 --- head/www/aws-demos/files/patch-demos_test__ldap_test__ldap.gpr	Thu Jul  4 12:31:07 2013	(r322270)
 +++ head/www/aws-demos/files/patch-demos_test__ldap_test__ldap.gpr	Thu Jul  4 12:35:35 2013	(r322271)
 @@ -1,11 +1,12 @@
 ---- demos/test_ldap/test_ldap.gpr.orig	2013-04-25 23:03:26.000000000 +0200
 -+++ demos/test_ldap/test_ldap.gpr	2013-04-25 23:03:52.000000000 +0200
 -@@ -42,7 +42,7 @@
 +--- demos/test_ldap/test_ldap.gpr.orig	2013-07-03 01:11:54.000000000 +0000
 ++++ demos/test_ldap/test_ldap.gpr
 +@@ -35,7 +35,8 @@ project Test_LDAP is
            when "Windows_NT" =>
               for Default_Switches ("Ada") use ("-lwldap32");
            when others =>
 --            for Default_Switches ("Ada") use ("-lldap");
 -+            for Default_Switches ("Ada") use ("-L@PREFIX@/lib", "-lldap");
 +-            for Default_Switches ("Ada") use ("-lldap", "-llber");
 ++            for Default_Switches ("Ada") use ("-L@PREFIX@/lib",
 ++               "-lldap", "-llber");
         end case;
      end Linker;
   
 
 Modified: head/www/aws-demos/pkg-plist
 ==============================================================================
 --- head/www/aws-demos/pkg-plist	Thu Jul  4 12:31:07 2013	(r322270)
 +++ head/www/aws-demos/pkg-plist	Thu Jul  4 12:35:35 2013	(r322271)
 @@ -1,8 +1,11 @@
  %%OSSL%%%%EXAMPLESDIR%%/agent
  %%EXAMPLESDIR%%/auth
 +%%EXAMPLESDIR%%/autobahn
 +%%EXAMPLESDIR%%/cert
  %%EXAMPLESDIR%%/com_1
  %%EXAMPLESDIR%%/com_2
  %%EXAMPLESDIR%%/dispatch
 +%%EXAMPLESDIR%%/download_manager
  %%EXAMPLESDIR%%/hello_world
  %%EXAMPLESDIR%%/hotplug
  @comment broken %%EXAMPLESDIR%%/interoplab_main
 @@ -11,6 +14,7 @@
  %%EXAMPLESDIR%%/multiple_sessions
  %%EXAMPLESDIR%%/res_demo
  %%OSSL%%%%EXAMPLESDIR%%/runme
 +%%EXAMPLESDIR%%/run.sh
  %%EXAMPLESDIR%%/soap_client
  %%EXAMPLESDIR%%/soap_cvs
  %%EXAMPLESDIR%%/soap_server
 @@ -20,15 +24,18 @@
  %%LDAP%%%%EXAMPLESDIR%%/test_ldap
  %%EXAMPLESDIR%%/test_mail
  %%EXAMPLESDIR%%/text_input
 +%%EXAMPLESDIR%%/upload
  %%EXAMPLESDIR%%/vh_demo
  %%EXAMPLESDIR%%/web_block
  %%EXAMPLESDIR%%/web_block_ajax
  %%EXAMPLESDIR%%/web_block_ajax_templates
  %%EXAMPLESDIR%%/web_elements
  %%EXAMPLESDIR%%/web_mail
 +%%EXAMPLESDIR%%/websock
  %%EXAMPLESDIR%%/wps
  %%EXAMPLESDIR%%/ws
  @comment broken %%EXAMPLESDIR%%/wsdl_demo_client
  @comment broken %%EXAMPLESDIR%%/wsdl_demo_server
  %%EXAMPLESDIR%%/zdemo
  @dirrmtry %%EXAMPLESDIR%%
 +@dirrmtry share/examples
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
