Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Apr 2013 21:25:47 GMT
From:      John Marino <draco@marino.st>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/178164: www/aws-demos: [NEW PORT] demos that were split out from www/aws
Message-ID:  <201304252125.r3PLPli9077539@red.freebsd.org>
Resent-Message-ID: <201304252130.r3PLU00D097039@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         178164
>Category:       ports
>Synopsis:       www/aws-demos: [NEW PORT] demos that were split out from www/aws
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 25 21:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     John Marino
>Release:        
>Organization:
>Environment:
>Description:
The AWS demos require AWS to be fully installed before they can build.  Before the demos were built in the install phase of www/aws, which isn't satisfactory.

It makes sense to split these out into their own port.
Some points:

1) Two demos don't build, they were commented out
2) LDAP demo now builds
3) SSL demos are now switched properly
4) They've been put in a separate directory from the other aws examples on purposes
5) Supports USES+= ada

Like the other Ada ports, tested in poudriere on FreeBSD 9.1 jail, amd64
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	www/aws-demos
#	www/aws-demos/Makefile
#	www/aws-demos/distinfo
#	www/aws-demos/pkg-descr
#	www/aws-demos/pkg-plist
#	www/aws-demos/files
#	www/aws-demos/files/patch-demos_test__ldap_test__ldap.gpr
#
echo c - www/aws-demos
mkdir -p www/aws-demos > /dev/null 2>&1
echo x - www/aws-demos/Makefile
sed 's/^X//' >www/aws-demos/Makefile << '506347afb807e53196d3fcb14534ce6c'
X# Created by: John Marino <draco@marino.st>
X# $FreeBSD: www/aws/Makefile 314915 2013-03-22 11:53:34Z bapt $
X
XPORTNAME=	aws
XPORTVERSION=	2.10.0
XCATEGORIES=	www
XMASTER_SITES=	http://downloads.dragonlace.net/src/
XPKGNAMESUFFIX=	-demos
X
XMAINTAINER=	draco@marino.st
XCOMMENT=	Adacore Ada Web Server demos
X
XBUILD_DEPENDS+=	gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \
X		xmlada>=3.2:${PORTSDIR}/textproc/xmlada \
X		aws>=2.10:${PORTSDIR}/www/aws
X
XUSE_BZIP2=	yes
XUSE_GMAKE=	yes
XUSES+=		ada
X
XCONF_ARGS=	PROCESSORS=1
XCONF_ARGS+=	GCC=ada
XCONF_ARGS+=	prefix=${PREFIX}
X
XOPTIONS_DEFINE=		SSL LDAP
XOPTIONS_DEFAULT=	SSL
X
XDEMO_DIRS+=	auth
XDEMO_DIRS+=	com
XDEMO_DIRS+=	dispatch
XDEMO_DIRS+=	hello_world
XDEMO_DIRS+=	hotplug
XDEMO_DIRS+=	jabber_demo
XDEMO_DIRS+=	multiple_sessions
XDEMO_DIRS+=	res_demo
XDEMO_DIRS+=	soap_demo
XDEMO_DIRS+=	soap_disp
XDEMO_DIRS+=	soap_vs
XDEMO_DIRS+=	split
XDEMO_DIRS+=	test_mail
XDEMO_DIRS+=	text_input
XDEMO_DIRS+=	vh_demo
XDEMO_DIRS+=	web_block
XDEMO_DIRS+=	web_block_ajax
XDEMO_DIRS+=	web_block_ajax_templates
XDEMO_DIRS+=	web_elements
XDEMO_DIRS+=	web_mail
XDEMO_DIRS+=	wps
XDEMO_DIRS+=	ws
XDEMO_DIRS+=	zdemo
X
X# These don't build, fail finding "aws.ini"
X#DEMO_DIRS+=	hello_wsdl
X#DEMO_DIRS+=	interoplab
X
X.include <bsd.port.options.mk>
X
X.if ${PORT_OPTIONS:MSSL}
XCONF_ARGS+=	SOCKET=openssl
XDEMO_DIRS+=	agent
XDEMO_DIRS+=	runme
XPLIST_SUB+=	OSSL=""
X.else
XPLIST_SUB+=	OSSL="@comment "
X.endif
X
X.if ${PORT_OPTIONS:MLDAP}
XCONF_ARGS+=	LDAP=true
XDEMO_DIRS+=	test_ldap
XPLIST_SUB+=	LDAP=""
X.else
XPLIST_SUB+=	LDAP="@comment "
X.endif
X
XEXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX}
X
Xpost-patch:
X	@${REINPLACE_CMD} -e 's|@PREFIX@|${LOCALBASE}|g' \
X		${WRKSRC}/demos/test_ldap/test_ldap.gpr
X
Xdo-configure:
X	${MKDIR} ${WRKSRC}/.build/native/debug/static/obj
X	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
X	   ${GMAKE} setup ${CONF_ARGS}
X
Xdo-build:
X.for dd in ${DEMO_DIRS}
X	@${ECHO_MSG} "=== BUILD ${dd} ==="
X	cd ${WRKSRC}/demos/${dd} && ${SETENV} ${MAKE_ENV} ${GMAKE}
X.endfor
X
Xdo-install:
X	${MKDIR} ${PREFIX}/share/examples/aws-demos
X.for dd in ${DEMO_DIRS}
X	${FIND} ${WRKSRC}/demos/${dd} -type f -perm -0001 \
X	   -exec ${INSTALL} {} ${PREFIX}/share/examples/aws-demos/ \;
X.endfor
X
X.include <bsd.port.mk>
506347afb807e53196d3fcb14534ce6c
echo x - www/aws-demos/distinfo
sed 's/^X//' >www/aws-demos/distinfo << 'fa878c62d7d5fb535e404b45d871cd68'
XSHA256 (aws-2.10.0.tar.bz2) = 010244129cc736d1ca415162dca79243fb243c3f0b12371a0ffc8a31c8b42f30
XSIZE (aws-2.10.0.tar.bz2) = 1384976
fa878c62d7d5fb535e404b45d871cd68
echo x - www/aws-demos/pkg-descr
sed 's/^X//' >www/aws-demos/pkg-descr << '52861c3f8e9aa3130fb1653a596b3d13'
XThis is a collection of demonstrations for the Ada Web Server.  The server
Xitself is located at www/aws.
X
XWWW: http://libre.adacore.com/libre/tools/aws/
52861c3f8e9aa3130fb1653a596b3d13
echo x - www/aws-demos/pkg-plist
sed 's/^X//' >www/aws-demos/pkg-plist << 'bf7b1c13de4cdcb65570a1c0c275de2a'
X%%OSSL%%%%EXAMPLESDIR%%/agent
X%%EXAMPLESDIR%%/auth
X%%EXAMPLESDIR%%/com_1
X%%EXAMPLESDIR%%/com_2
X%%EXAMPLESDIR%%/dispatch
X%%EXAMPLESDIR%%/hello_world
X%%EXAMPLESDIR%%/hotplug
X@comment broken %%EXAMPLESDIR%%/interoplab_main
X%%EXAMPLESDIR%%/jabber_demo
X%%EXAMPLESDIR%%/main
X%%EXAMPLESDIR%%/multiple_sessions
X%%EXAMPLESDIR%%/res_demo
X%%OSSL%%%%EXAMPLESDIR%%/runme
X%%EXAMPLESDIR%%/soap_client
X%%EXAMPLESDIR%%/soap_cvs
X%%EXAMPLESDIR%%/soap_server
X%%EXAMPLESDIR%%/soap_server_disp
X%%EXAMPLESDIR%%/soap_svs
X%%EXAMPLESDIR%%/split
X%%LDAP%%%%EXAMPLESDIR%%/test_ldap
X%%EXAMPLESDIR%%/test_mail
X%%EXAMPLESDIR%%/text_input
X%%EXAMPLESDIR%%/vh_demo
X%%EXAMPLESDIR%%/web_block
X%%EXAMPLESDIR%%/web_block_ajax
X%%EXAMPLESDIR%%/web_block_ajax_templates
X%%EXAMPLESDIR%%/web_elements
X%%EXAMPLESDIR%%/web_mail
X%%EXAMPLESDIR%%/wps
X%%EXAMPLESDIR%%/ws
X@comment broken %%EXAMPLESDIR%%/wsdl_demo_client
X@comment broken %%EXAMPLESDIR%%/wsdl_demo_server
X%%EXAMPLESDIR%%/zdemo
X@dirrmtry %%EXAMPLESDIR%%
bf7b1c13de4cdcb65570a1c0c275de2a
echo c - www/aws-demos/files
mkdir -p www/aws-demos/files > /dev/null 2>&1
echo x - www/aws-demos/files/patch-demos_test__ldap_test__ldap.gpr
sed 's/^X//' >www/aws-demos/files/patch-demos_test__ldap_test__ldap.gpr << '5eb53f67ed00d1938b541509bd683233'
X--- demos/test_ldap/test_ldap.gpr.orig	2013-04-25 23:03:26.000000000 +0200
X+++ demos/test_ldap/test_ldap.gpr	2013-04-25 23:03:52.000000000 +0200
X@@ -42,7 +42,7 @@
X          when "Windows_NT" =>
X             for Default_Switches ("Ada") use ("-lwldap32");
X          when others =>
X-            for Default_Switches ("Ada") use ("-lldap");
X+            for Default_Switches ("Ada") use ("-L@PREFIX@/lib", "-lldap");
X       end case;
X    end Linker;
X 
5eb53f67ed00d1938b541509bd683233
exit



>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304252125.r3PLPli9077539>