Attachment #69036 for bug #101279

View | Details | Raw Unified | Return to bug 101279
Collapse All | Expand All




# $FreeBSD: ports/games/jfduke3d/Makefile,v 1.8 2006/05/07 23:45:21 edwin Exp $

PORTNAME=	jfduke3d
PORTVERSION=	20051009
CATEGORIES=	games
MASTER_SITES=	ftp://dialup.edgefiles.com/edgenetwork.org/jonof/buildport/ \
		ftp://ftp1.edgefiles.com/edgenetwork.org/jonof/buildport/ \

DISTFILES=	${PORTNAME}_src_${PORTVERSION}.zip \
		jfbuild_src_${PORTVERSION}.zip

PATCH_SITES=	http://www.mephisto.ma.cx/mephisto/patches/
PATCHFILES=	${PORTNAME}_src_${PORTVERSION}.patch \
		jfbuild_src_${PORTVERSION}.patch

MAINTAINER=	arundel@h3c.de
COMMENT=	Jonathon Fowler's Duke Nukem 3D Port

BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm

USE_ZIP=	yes
USE_GCC=	3.2+
USE_GMAKE=	yes
USE_GL=		yes
USE_GNOME=	gtk20
USE_SDL=	mixer sdl

WRKSRC=		${WRKDIR}/${PORTNAME}_src_${PORTVERSION}
PATCH_WRKSRC=	${WRKDIR}

post-patch:
	@${REINPLACE_CMD} -Ee \
		's|^(EROOT=)../build/|\1../jfbuild_src_${PORTVERSION}/|; \
		 s|^(CC=).*|\1${CC}|; \
		 s|^(CFLAGS=).*|\1${CFLAGS}|; \
		 s|^(NASMFLAGS=).*|\1 -s -f elf|; \
		 s|/usr/X11R6|${X11BASE}|; \
		 s|sdl-config|${SDL_CONFIG}|' \
		${WRKSRC}/Makefile \
		${WRKDIR}/jfbuild_src_${PORTVERSION}/Makefile \
		${WRKDIR}/jfbuild_src_${PORTVERSION}/Makefile.shared
	@${REINPLACE_CMD} -e 's|/usr/share/games/jfduke3d|${DN3DDIR}|' \
		${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c
pre-build:
		@${REINPLACE_CMD} -e 's|EROOT=../build/|EROOT=../jfbuild_src_${PORTVERSION}/|g' \
			${WRKSRC}/Makefile

pre-install:
		@${SED} -e 's|%%DUKEDIR%%|${DATADIR}|g' ${FILESDIR}/fix.sh > \
			${WRKDIR}/fix.sh
		@${SED} -e 's|%%DUKEDIR%%|${DATADIR}|g' ${FILESDIR}/wrapper.sh > \
			${WRKDIR}/duke3d.sh
		@${SED} -e 's|%%DUKEDIR%%|${DATADIR}|g' ${FILESDIR}/build-wrapper.sh > \
			${WRKDIR}/build.sh

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/duke3d ${PREFIX}/bin/${PORTNAME}
	${INSTALL_PROGRAM} ${WRKSRC}/build ${PREFIX}/bin/${PORTNAME}-build
.if !defined(NOPORTDOCS)
.for f in ChangeLog readme.txt releasenotes.html duke3d.def.sample
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}

post-install:
.ifndef(NOPORTDOCS)
		${INSTALL} -d ${DOCSDIR}

.for file in ${PORTDOCS}
		${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
		${CAT} ${PKGMESSAGE}

.include "${.CURDIR}/../duke3d-data/Makefile.include"

.include <bsd.port.mk>




MD5 (jfduke3d_src_20051009.zip) = b67bdcb3dda1a18b6802e26c6588bf11
SHA256 (jfduke3d_src_20051009.zip) = 910a1616ee5f3b83d1a0ff25ff463112f82fc68e55cb76922ccbdff82c0bb140
SIZE (jfduke3d_src_20051009.zip) = 686915
MD5 (jfbuild_src_20051009.zip) = 44a943c0050bfd46ce1e6af24c951898
SHA256 (jfbuild_src_20051009.zip) = 4bab5eb5171b6480c529f2076411f83038bd19861e3a9c8ede95c4c026bd746e
SIZE (jfbuild_src_20051009.zip) = 610745
MD5 (jfduke3d_src_20051009.patch) = 7575e8f78b1cb9c39645f2d49915e738
SHA256 (jfduke3d_src_20051009.patch) = 0abf81415c32259dffa659bbb49e4b4c41513005b34deae87921bdd05b25bdb3
SIZE (jfduke3d_src_20051009.patch) = 117574
MD5 (jfbuild_src_20051009.patch) = b5db75643dd9034749f0a8766354c03b
SHA256 (jfbuild_src_20051009.patch) = b8c2b53b768c419e2f552c79237af42c9055d6d2ff3d59963ad9f97c674e18d3
SIZE (jfbuild_src_20051009.patch) = 3788




JonoF's Duke Nukem 3D Port with icculus.org/duke3d patches for sound and
joystick support.

This is the Duke Nukem 3D Port written by Jonathan Fowler. Like any other Duke
Nukem 3D Port it is a hack of the original Duke Nukem 3D source code (v1.5 CD
Version) which was made publicly avilable by 3D Realms (the developer of Duke
Nukem 3D) on the 1st of April 2003.

The following Duke Nukem 3D versions are supported:
* Duke3D Shareware
* Duke3D 1.3d
* Duke3D 1.4/5 Atomic

Be sure to read the release notes in this distribution. There's important
information about using the new features in this release.

Additions to the retail version features of Duke Nukem 3D can be found on the
3D Realms forum. These patches/hacks feature high/low resolution textures,
MD2/MD3 models, Blood and Gore hacks, map hacks, etc. The 3D Realms Forum can
be accessed through this URL:

http://forums.3drealms.com/

WWW: http://jonof.edgenetwork.org/index.php?p=jfduke3d

Lines 1-9 Link Here

(-)jfduke3d/pkg-plist (-9 / +7 lines)
1	%%DATADIR%%/duke3d	1	bin/jfduke3d
2	%%DATADIR%%/build	2	bin/jfduke3d-build
3	%%DATADIR%%/fix.sh	3	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
4	%%DATADIR%%/duke3d.sh	4	%%PORTDOCS%%%%DOCSDIR%%/duke3d.def.sample
5	%%DATADIR%%/build.sh	5	%%PORTDOCS%%%%DOCSDIR%%/readme.txt
6	%%DATADIR%%/build.cfg	6	%%PORTDOCS%%%%DOCSDIR%%/releasenotes.html
7	bin/duke3d	7	%%PORTDOCS%%@dirrm %%DOCSDIR%%
8	bin/duke3d-build
9	@dirrmtry share/jfduke3d

Removed Link Here

(-)jfduke3d/files/build-wrapper.sh (-6 lines)
1	#!/bin/sh
2	# Needed to make symlinks/shortcuts work.
3	# Wrap build (editor) binary
4	cd %%DUKEDIR%%
5	./build $*
6	exit $?




#!/bin/sh
cd %%DUKEDIR%%

if [ ! -d %%DUKEDIR%% ] || [ ! -w %%DUKEDIR%% ]
then
	echo You do not have permission to write to %%DUKEDIR%%.
	exit
fi

if [ ! -f DUKE3D.GRP ]
then
	echo DUKE3D.GRP is missing
	exit
fi

echo Renamed DUKE3D.GRP to duke3d.grp
mv -f ./DUKE3D.GRP ./duke3d.grp

Removed Link Here

(-)jfduke3d/files/patch-Makefile (-11 lines)
1	--- Makefile.orig Fri Aug 26 20:17:49 2005
2	+++ Makefile Fri Aug 26 20:18:07 2005
3	@@ -88,7 +88,7 @@
4	endif
5
6	ifeq ($(RENDERTYPE),SDL)
7	- override CFLAGS+= $(subst -Dmain=SDL_main,,$(shell sdl-config --cflags))
8	+ override CFLAGS+= $(subst -Dmain=SDL_main,,$(shell sdl11-config --cflags))
9	AUDIOLIBOBJ=$(AUDIOLIB_MUSIC_STUB) $(AUDIOLIB_FX_STUB)
10	GAMEOBJS+= $(OBJ)game_icon.$o
11	EDITOROBJS+= $(OBJ)build_icon.$o

Removed Link Here

(-)jfduke3d/files/patch-jfbuild_src_20050531-Makefile (-11 lines)
1	--- ../jfbuild_src_20050531/Makefile.orig Thu Oct 27 17:32:56 2005
2	+++ ../jfbuild_src_20050531/Makefile Thu Oct 27 17:35:56 2005
3	@@ -93,7 +93,7 @@
4	endif
5	ifeq ($(PLATFORM),BSD)
6	ASFLAGS+= -f elf
7	- override CFLAGS+= -I/usr/X11R6/include
8	+ override CFLAGS+= -I$(PREFIX)/include
9	endif
10	ifeq ($(PLATFORM),WINDOWS)
11	override CFLAGS+= -DUNDERSCORES -I$(DXROOT)/include -I$(FMODROOT)/inc

Removed Link Here

(-)jfduke3d/files/patch-jfbuild_src_20050531-Makefile.shared (-11 lines)
1	--- ../jfbuild_src_20050531/Makefile.shared.orig Sun Sep 4 15:03:56 2005
2	+++ ../jfbuild_src_20050531/Makefile.shared Sun Sep 4 15:04:04 2005
3	@@ -10,7 +10,7 @@
4	GLLIBBSD=-lopengl32
5	GLLIBLIN=-lGL
6
7	-SDLCONFIG=sdl-config
8	+SDLCONFIG=sdl11-config
9	#SDLCONFIG=/usr/local/bin/sdl11-config
10
11	# detect the platform




-----------------------------------------------------------------
JonoF's Duke Nukem 3D Port has been successfully installed.

You still need the original Duke Nukem 3D data file. Please copy DUKE3D.GRP to
the %%DATADIR%% directory and run the fix.sh script inside that directory.

The JonoF Duke Nukem 3D Port supports the following Duke Nukem 3D versions:

* Duke3D Shareware
* Duke3D 1.3d
* Duke3D 1.4/5 Atomic

NOTE: Be sure to read the release notes in this distribution. There's important
information about using the new features in this release.

The release notes can be found in %%DOCSDIR%%.

If you have any problems with running this port please contact the maintainer
of this port and NOT Jonathan Fowler.

The following features are not usable at the moment:

* Sound doesn't work
* No joystick support
* GL mode doesn't work

NOTE: You can find patches which enable sound and add joystick support here:

http://jonof.edgenetwork.org/forum/viewtopic.php?p=3245

I was not able to compile the port with these patches. If you manage to do so
and the binary runs under FreeBSD with sound/jostick support enabled, please
drop me a note telling me how you did it. I'd really like to add those patches
to the port, because especially the lack of sound reduces the gameplay-fun a
lot.

NOTE: Additions to the retail version features of Duke Nukem 3D can be found on
the 3D Realms forum. These patches/hacks feature high/low resolution textures,
MD2/MD3 models, Blood and Gore hacks, map hacks, etc. The 3D Realms Forum can
be accessed through this URL:

http://forums.3drealms.com/

Thx.
-----------------------------------------------------------------

Removed Link Here

(-)jfduke3d/files/wrapper.sh (-6 lines)
1	#!/bin/sh
2	# Needed to make symlinks/shortcuts work.
3	# Wrap duke3d binary
4	cd %%DUKEDIR%%
5	./duke3d $*
6	exit $?

Return to bug 101279

Lines 5-11 Link Here

(-)jfduke3d/Makefile (-43 / +31 lines)
5	# $FreeBSD: ports/games/jfduke3d/Makefile,v 1.8 2006/05/07 23:45:21 edwin Exp $	5	# $FreeBSD: ports/games/jfduke3d/Makefile,v 1.8 2006/05/07 23:45:21 edwin Exp $
6		6
7	PORTNAME= jfduke3d	7	PORTNAME= jfduke3d
8	PORTVERSION= 20050531	8	PORTVERSION= 20051009
9	CATEGORIES= games	9	CATEGORIES= games
10	MASTER_SITES= ftp://dialup.edgefiles.com/edgenetwork.org/jonof/buildport/ \	10	MASTER_SITES= ftp://dialup.edgefiles.com/edgenetwork.org/jonof/buildport/ \
11	ftp://ftp1.edgefiles.com/edgenetwork.org/jonof/buildport/ \	11	ftp://ftp1.edgefiles.com/edgenetwork.org/jonof/buildport/ \
Lines 14-73 Link Here
14	DISTFILES= ${PORTNAME}_src_${PORTVERSION}.zip \	14	DISTFILES= ${PORTNAME}_src_${PORTVERSION}.zip \
15	jfbuild_src_${PORTVERSION}.zip	15	jfbuild_src_${PORTVERSION}.zip
16		16
		17	PATCH_SITES= http://www.mephisto.ma.cx/mephisto/patches/
		18	PATCHFILES= ${PORTNAME}_src_${PORTVERSION}.patch \
		19	jfbuild_src_${PORTVERSION}.patch
		20
17	MAINTAINER= arundel@h3c.de	21	MAINTAINER= arundel@h3c.de
18	COMMENT= Jonathon Fowler's Duke Nukem 3D Port	22	COMMENT= Jonathon Fowler's Duke Nukem 3D Port
19		23
20	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm	24	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
21		25
22	USE_ZIP= yes	26	USE_ZIP= yes
		27	USE_GCC= 3.2+
23	USE_GMAKE= yes	28	USE_GMAKE= yes
24	USE_SDL= sdl	29	USE_GL= yes
25	USE_GNOME= gtk20	30	USE_GNOME= gtk20
26	CONFLICTS= duke3d-200[0-9]*	31	USE_SDL= mixer sdl
27
28	WRKSRC= ${WRKDIR}/${PORTNAME}_src_${PORTVERSION}	32	WRKSRC= ${WRKDIR}/${PORTNAME}_src_${PORTVERSION}
		33	PATCH_WRKSRC= ${WRKDIR}
29		34
30	PROG_FILES= ${WRKSRC}/duke3d ${WRKSRC}/build	35	post-patch:
31	DATA_FILES= ${WRKSRC}/build.cfg	36	@${REINPLACE_CMD} -Ee \
32	SCRIPT_FILES= ${WRKDIR}/fix.sh ${WRKDIR}/duke3d.sh ${WRKDIR}/build.sh	37	's\|^(EROOT=)../build/\|\1../jfbuild_src_${PORTVERSION}/\|; \
33	PORTDOCS= ChangeLog readme.txt releasenotes.html duke3d.def.sample GNU.TXT	38	s\|^(CC=).*\|\1${CC}\|; \
34		39	s\|^(CFLAGS=).*\|\1${CFLAGS}\|; \
35	SUB_FILES= pkg-message	40	s\|^(NASMFLAGS=).*\|\1 -s -f elf\|; \
36		41	s\|/usr/X11R6\|${X11BASE}\|; \
37	.include <bsd.port.pre.mk>	42	s\|sdl-config\|${SDL_CONFIG}\|' \
38		43	${WRKSRC}/Makefile \
39	.if ${ARCH} != "i386"	44	${WRKDIR}/jfbuild_src_${PORTVERSION}/Makefile \
40	BROKEN= "Does not build on !i386 (hardcodes i386-specific compiler flags)"	45	${WRKDIR}/jfbuild_src_${PORTVERSION}/Makefile.shared
41	.endif	46	@${REINPLACE_CMD} -e 's\|/usr/share/games/jfduke3d\|${DN3DDIR}\|' \
42		47	${WRKSRC}/source/game.c ${WRKSRC}/source/astub.c
43	pre-build:
44	@${REINPLACE_CMD} -e 's\|EROOT=../build/\|EROOT=../jfbuild_src_${PORTVERSION}/\|g' \
45	${WRKSRC}/Makefile
46
47	pre-install:
48	@${SED} -e 's\|%%DUKEDIR%%\|${DATADIR}\|g' ${FILESDIR}/fix.sh > \
49	${WRKDIR}/fix.sh
50	@${SED} -e 's\|%%DUKEDIR%%\|${DATADIR}\|g' ${FILESDIR}/wrapper.sh > \
51	${WRKDIR}/duke3d.sh
52	@${SED} -e 's\|%%DUKEDIR%%\|${DATADIR}\|g' ${FILESDIR}/build-wrapper.sh > \
53	${WRKDIR}/build.sh
54		48
55	do-install:	49	do-install:
56	${INSTALL} -d ${DATADIR}	50	${INSTALL_PROGRAM} ${WRKSRC}/duke3d ${PREFIX}/bin/${PORTNAME}
57	${INSTALL_PROGRAM} ${PROG_FILES} ${DATADIR}	51	${INSTALL_PROGRAM} ${WRKSRC}/build ${PREFIX}/bin/${PORTNAME}-build
58	${INSTALL_DATA} ${DATA_FILES} ${DATADIR}	52	.if !defined(NOPORTDOCS)
59	${INSTALL_SCRIPT} ${SCRIPT_FILES} ${DATADIR}	53	.for f in ChangeLog readme.txt releasenotes.html duke3d.def.sample
60	${LN} -fs ${DATADIR}/duke3d.sh ${PREFIX}/bin/duke3d	54	${MKDIR} ${DOCSDIR}
61	${LN} -fs ${DATADIR}/build.sh ${PREFIX}/bin/duke3d-build	55	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
62
63	post-install:
64	.ifndef(NOPORTDOCS)
65	${INSTALL} -d ${DOCSDIR}
66
67	.for file in ${PORTDOCS}
68	${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
69	.endfor	56	.endfor
70	.endif	57	.endif
71	${CAT} ${PKGMESSAGE}
72		58
73	.include <bsd.port.post.mk>	59	.include "${.CURDIR}/../duke3d-data/Makefile.include"
		60
		61	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)jfduke3d/distinfo (-6 / +12 lines)
1	MD5 (jfduke3d_src_20050531.zip) = 0a56a99da81c8358aa43a869cfac4f81	1	MD5 (jfduke3d_src_20051009.zip) = b67bdcb3dda1a18b6802e26c6588bf11
2	SHA256 (jfduke3d_src_20050531.zip) = e740afd3a2cc5b7a3f55a6b61bc5c2cfb1319e44c99cbf7ffb491e02d202a2eb	2	SHA256 (jfduke3d_src_20051009.zip) = 910a1616ee5f3b83d1a0ff25ff463112f82fc68e55cb76922ccbdff82c0bb140
3	SIZE (jfduke3d_src_20050531.zip) = 612758	3	SIZE (jfduke3d_src_20051009.zip) = 686915
4	MD5 (jfbuild_src_20050531.zip) = 100c74de1bbbea5d661feb4665df2eb0	4	MD5 (jfbuild_src_20051009.zip) = 44a943c0050bfd46ce1e6af24c951898
5	SHA256 (jfbuild_src_20050531.zip) = f601b0f01de0b0d2f0bb927ebe6b48816ba847f9f36d6a841a36e980c8803666	5	SHA256 (jfbuild_src_20051009.zip) = 4bab5eb5171b6480c529f2076411f83038bd19861e3a9c8ede95c4c026bd746e
6	SIZE (jfbuild_src_20050531.zip) = 542176	6	SIZE (jfbuild_src_20051009.zip) = 610745
		7	MD5 (jfduke3d_src_20051009.patch) = 7575e8f78b1cb9c39645f2d49915e738
		8	SHA256 (jfduke3d_src_20051009.patch) = 0abf81415c32259dffa659bbb49e4b4c41513005b34deae87921bdd05b25bdb3
		9	SIZE (jfduke3d_src_20051009.patch) = 117574
		10	MD5 (jfbuild_src_20051009.patch) = b5db75643dd9034749f0a8766354c03b
		11	SHA256 (jfbuild_src_20051009.patch) = b8c2b53b768c419e2f552c79237af42c9055d6d2ff3d59963ad9f97c674e18d3
		12	SIZE (jfbuild_src_20051009.patch) = 3788

Lines 1-10 Link Here

(-)jfduke3d/pkg-descr (-7 / +21 lines)
1	JonoF's Duke Nukem 3D Port	1	JonoF's Duke Nukem 3D Port with icculus.org/duke3d patches for sound and
		2	joystick support.
2		3
3	This is the Duke Nukem 3D Port written by Jonathan Fowler. Like any	4	This is the Duke Nukem 3D Port written by Jonathan Fowler. Like any other Duke
4	other Duke Nukem 3D Port it is a hack of the original Duke Nukem 3D	5	Nukem 3D Port it is a hack of the original Duke Nukem 3D source code (v1.5 CD
5	source code (v1.5 CD Version) which was made publicly avilable by	6	Version) which was made publicly avilable by 3D Realms (the developer of Duke
6	3D Realms (the developer of Duke Nukem 3D) on the 1st of April 2003.	7	Nukem 3D) on the 1st of April 2003.
7		8
8	WWW: http://jonof.edgenetwork.org/index.php?p=jfduke3d	9	The following Duke Nukem 3D versions are supported:
		10	* Duke3D Shareware
		11	* Duke3D 1.3d
		12	* Duke3D 1.4/5 Atomic
9		13
10	arundel@h3c.de	14	Be sure to read the release notes in this distribution. There's important
		15	information about using the new features in this release.
		16
		17	Additions to the retail version features of Duke Nukem 3D can be found on the
		18	3D Realms forum. These patches/hacks feature high/low resolution textures,
		19	MD2/MD3 models, Blood and Gore hacks, map hacks, etc. The 3D Realms Forum can
		20	be accessed through this URL:
		21
		22	http://forums.3drealms.com/
		23
		24	WWW: http://jonof.edgenetwork.org/index.php?p=jfduke3d

Removed Link Here

(-)jfduke3d/files/fix.sh (-17 lines)
1	#!/bin/sh
2	cd %%DUKEDIR%%
3
4	if [ ! -d %%DUKEDIR%% ] \|\| [ ! -w %%DUKEDIR%% ]
5	then
6	echo You do not have permission to write to %%DUKEDIR%%.
7	exit
8	fi
9
10	if [ ! -f DUKE3D.GRP ]
11	then
12	echo DUKE3D.GRP is missing
13	exit
14	fi
15
16	echo Renamed DUKE3D.GRP to duke3d.grp
17	mv -f ./DUKE3D.GRP ./duke3d.grp

Removed Link Here

(-)jfduke3d/files/pkg-message.in (-45 lines)
1	-----------------------------------------------------------------
2	JonoF's Duke Nukem 3D Port has been successfully installed.
3
4	You still need the original Duke Nukem 3D data file. Please copy DUKE3D.GRP to
5	the %%DATADIR%% directory and run the fix.sh script inside that directory.
6
7	The JonoF Duke Nukem 3D Port supports the following Duke Nukem 3D versions:
8
9	* Duke3D Shareware
10	* Duke3D 1.3d
11	* Duke3D 1.4/5 Atomic
12
13	NOTE: Be sure to read the release notes in this distribution. There's important
14	information about using the new features in this release.
15
16	The release notes can be found in %%DOCSDIR%%.
17
18	If you have any problems with running this port please contact the maintainer
19	of this port and NOT Jonathan Fowler.
20
21	The following features are not usable at the moment:
22
23	* Sound doesn't work
24	* No joystick support
25	* GL mode doesn't work
26
27	NOTE: You can find patches which enable sound and add joystick support here:
28
29	http://jonof.edgenetwork.org/forum/viewtopic.php?p=3245
30
31	I was not able to compile the port with these patches. If you manage to do so
32	and the binary runs under FreeBSD with sound/jostick support enabled, please
33	drop me a note telling me how you did it. I'd really like to add those patches
34	to the port, because especially the lack of sound reduces the gameplay-fun a
35	lot.
36
37	NOTE: Additions to the retail version features of Duke Nukem 3D can be found on
38	the 3D Realms forum. These patches/hacks feature high/low resolution textures,
39	MD2/MD3 models, Blood and Gore hacks, map hacks, etc. The 3D Realms Forum can
40	be accessed through this URL:
41
42	http://forums.3drealms.com/
43
44	Thx.
45	-----------------------------------------------------------------