Date: Fri, 5 Jun 2009 06:05:20 +0400 (MSD) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: olgeni@FreeBSD.org Subject: ports/135272: [PATCH] devel/esdl: update to 1.0.1 Message-ID: <20090605020520.8C72D108839@hades.panopticon> Resent-Message-ID: <200906050210.n552A29N029240@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135272 >Category: ports >Synopsis: [PATCH] devel/esdl: update to 1.0.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jun 05 02:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 8.0-CURRENT i386 >Organization: >Environment: System: FreeBSD hades.panopticon 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Mon Jun 1 22:13:51 MSD >Description: - Update to 1.0.1 Port maintainer (olgeni@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- esdl-1.0.1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/esdl/Makefile,v retrieving revision 1.32 diff -u -u -r1.32 Makefile --- Makefile 6 Nov 2008 00:06:11 -0000 1.32 +++ Makefile 4 Jun 2009 23:03:00 -0000 @@ -6,11 +6,9 @@ # PORTNAME= esdl -PORTVERSION= 0.96.0626 -PORTREVISION= 6 +PORTVERSION= 1.0.1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}.src DIST_SUBDIR= erlang @@ -22,14 +20,40 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_GL= yes +USE_GL= gl glu USE_GMAKE= yes USE_SDL= sdl ALL_TARGET= target PLIST_SUB= VERSION="${PORTVERSION}" +OPTIONS= SDL_TTF "SDL_ttf support" on \ + SDL_IMAGE "SDL_image support" on + .include <bsd.port.pre.mk> +.if !defined(WITHOUT_SDL_TTF) +USE_SDL+= ttf +PLIST_SUB+= SDL_TTF="" +.else +PLIST_SUB+= SDL_TTF="@comment " +.endif + +.if !defined(WITHOUT_SDL_IMAGE) +USE_SDL+= image +PLIST_SUB+= SDL_IMAGE="" +.else +PLIST_SUB+= SDL_IMAGE="@comment " +.endif + +post-patch: + @${REINPLACE_CMD} -Ee 's|addons|lib|' ${WRKSRC}/Makefile +.if !defined(WITHOUT_SDL_TTF) + @${REINPLACE_CMD} -e '/ENABLE_SDL_TTF = / s|no|yes|' ${WRKSRC}/Makefile +.endif +.if !defined(WITHOUT_SDL_IMAGE) + @${REINPLACE_CMD} -e '/ENABLE_SDL_IMAGE = / s|no|yes|' ${WRKSRC}/Makefile +.endif + post-install: @${LN} -sf ${PORTNAME}-${PORTVERSION} ${PREFIX}/lib/erlang/lib/${PORTNAME} Index: distinfo =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/esdl/distinfo,v retrieving revision 1.10 diff -u -u -r1.10 distinfo --- distinfo 10 Dec 2006 21:05:22 -0000 1.10 +++ distinfo 2 Jun 2009 02:16:08 -0000 @@ -1,3 +1,3 @@ -MD5 (erlang/esdl-0.96.0626.src.tar.gz) = 5007750ddd989319442e8e040db3b6dd -SHA256 (erlang/esdl-0.96.0626.src.tar.gz) = 8536168826688bfb774d197f3347d823327e21b186e992e8a3dd1e4e610b796e -SIZE (erlang/esdl-0.96.0626.src.tar.gz) = 416553 +MD5 (erlang/esdl-1.0.1.src.tar.gz) = 50230ea81418cb029281a70627a5dd8e +SHA256 (erlang/esdl-1.0.1.src.tar.gz) = 16fcf29656e6a54c9e10d0a73faa3e5b305c6aab3ab691cad2206c427265877d +SIZE (erlang/esdl-1.0.1.src.tar.gz) = 428917 Index: pkg-plist =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/esdl/pkg-plist,v retrieving revision 1.11 diff -u -u -r1.11 pkg-plist --- pkg-plist 19 Apr 2008 01:37:39 -0000 1.11 +++ pkg-plist 4 Jun 2009 23:02:24 -0000 @@ -23,6 +23,10 @@ lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_sdl_fp.h lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_spec.c lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.c +lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_ttf.h +lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_ttf.c +lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_img.h +lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_img.c lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.h lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.c lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.h @@ -34,9 +38,11 @@ lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_active.html lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_audio.html lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_events.html +lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_img.html lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_joystick.html lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_keyboard.html lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_mouse.html +lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_ttf.html lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_util.html lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_video.html lib/erlang/lib/esdl-%%VERSION%%/ebin/gl.beam @@ -45,9 +51,11 @@ lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_active.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_audio.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_events.beam +%%SDL_IMAGE%%lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_img.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_joystick.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_keyboard.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_mouse.beam +%%SDL_TTF%%lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_ttf.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_util.beam lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_video.beam lib/erlang/lib/esdl-%%VERSION%%/include/gl.hrl @@ -59,6 +67,7 @@ lib/erlang/lib/esdl-%%VERSION%%/include/sdl_joystick.hrl lib/erlang/lib/esdl-%%VERSION%%/include/sdl_keyboard.hrl lib/erlang/lib/esdl-%%VERSION%%/include/sdl_mouse.hrl +lib/erlang/lib/esdl-%%VERSION%%/include/sdl_ttf.hrl lib/erlang/lib/esdl-%%VERSION%%/include/sdl_video.hrl lib/erlang/lib/esdl-%%VERSION%%/license.terms lib/erlang/lib/esdl-%%VERSION%%/priv/sdl_driver.so @@ -72,14 +81,18 @@ lib/erlang/lib/esdl-%%VERSION%%/src/sdl_active.erl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_audio.erl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_events.erl +lib/erlang/lib/esdl-%%VERSION%%/src/sdl_img.erl +lib/erlang/lib/esdl-%%VERSION%%/src/sdl_img_funcs.hrl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_joystick.erl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_keyboard.erl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_mouse.erl +lib/erlang/lib/esdl-%%VERSION%%/src/sdl_ttf.erl +lib/erlang/lib/esdl-%%VERSION%%/src/sdl_ttf_funcs.hrl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.erl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.hrl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video.erl lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video_funcs.hrl -lib/erlang/lib/esdl-%%VERSION%%/vsn +lib/erlang/lib/esdl-%%VERSION%%/vsn.mk @dirrm lib/erlang/lib/esdl-%%VERSION%%/src @dirrm lib/erlang/lib/esdl-%%VERSION%%/priv @dirrm lib/erlang/lib/esdl-%%VERSION%%/include Index: files/patch-c__src_Makefile =================================================================== RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/esdl/files/patch-c__src_Makefile,v retrieving revision 1.7 diff -u -u -r1.7 patch-c__src_Makefile --- files/patch-c__src_Makefile 19 Apr 2008 17:47:43 -0000 1.7 +++ files/patch-c__src_Makefile 2 Jun 2009 02:19:34 -0000 @@ -1,49 +1,51 @@ - -$FreeBSD: ports/devel/esdl/files/patch-c__src_Makefile,v 1.7 2008/04/19 17:47:43 miwi Exp $ - ---- c_src/Makefile.orig -+++ c_src/Makefile +--- c_src/Makefile.orig 2009-05-20 22:34:48.000000000 +0400 ++++ c_src/Makefile 2009-06-02 06:19:34.000000000 +0400 @@ -11,7 +11,7 @@ - include ../win32_conf/mingw_vars.mk - else - -- OGLDIR = /usr -+ OGLDIR = ${LOCALBASE} - - # Uncomment these if your opengl header is located in another directory than - # the usual $(OGLDIR)/include/GL/gl.h -@@ -21,14 +21,13 @@ - GL_LIBS = -L$(OGLDIR)/lib -lGL -lGLU - GL_INCS = -I$(OGLDIR)/include/$(GL_INCLUDE_DIR) - -- SDL_LIBS = $(shell sdl-config --libs) -- SDL_INCS = $(shell sdl-config --cflags) -+ SDL_LIBS = $(shell $(SDL_CONFIG) --libs) -+ SDL_INCS = $(shell $(SDL_CONFIG) --cflags) - - LIBS = $(GL_LIBS) $(SDL_LIBS) -lm - -- CFLAGS = -g -O2 -funroll-loops -Wall -ffast-math -fpic \ -- -fomit-frame-pointer $(USE_GL_INCLUDE_DIR) -DSHM \ -- -DPTHREADS $(GL_INCS) $(SDL_INCS) $(ERL_INCS) -+ CFLAGS += -O2 -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \ -+ $(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDL_INCS) $(ERL_INCS) - - CLINKFLAGS = -fpic -shared - -@@ -38,13 +37,13 @@ - ERL_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),halt().' | erl | grep '1>' | sed 's,^[0-9]*> *,,g') - ERL_INCS = -I$(ERL_DIR)/usr/include - -- CC = gcc -+ CC ?= gcc - - endif - - TARGETDIR = ../priv - --GCC_O = $(CC) -c $(CFLAGS) $< -+GCC_O = $(CC) -c $(CFLAGS) $(INCS) $(ERLINC) $< - - # Files - + include ../win32_conf/mingw_vars.mk + else + +- OGLDIR = /usr ++ OGLDIR = ${LOCALBASE} + + # Uncomment these if your opengl header is located in another directory than + # the usual $(OGLDIR)/include/GL/gl.h +@@ -21,8 +21,8 @@ + GL_LIBS = -L$(OGLDIR)/lib -lGL -lGLU + GL_INCS = -I$(OGLDIR)/include/$(GL_INCLUDE_DIR) + +- SDL_LIBS = $(shell sdl-config --libs) +- SDL_INCS = $(shell sdl-config --cflags) ++ SDL_LIBS = $(shell $(SDL_CONFIG) --libs) ++ SDL_INCS = $(shell $(SDL_CONFIG) --cflags) + + ifeq ($(ENABLE_SDL_TTF), yes) + SDL_TTF_LIBS = -lSDL_ttf +@@ -43,10 +43,8 @@ + INCS = $(GL_INCS) $(SDL_INCS) $(SDL_TTF_INCS) \ + $(SDL_IMAGE_INCS) $(ERL_INCS) + +- CFLAGS = -g -O2 -funroll-loops -Wall -ffast-math -fpic \ +- -fomit-frame-pointer $(USE_GL_INCLUDE_DIR) -DSHM \ +- $(USE_SDL_TTF) $(USE_SDL_IMAGE) \ +- -DPTHREADS $(INCS) ++ CFLAGS += -O2 -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \ ++ $(USE_GL_INCLUDE_DIR) -DSHM $(USE_SDL_TTF) $(USE_SDL_IMAGE) -DPTHREADS $(INCS) + + CLINKFLAGS = -fpic -shared + +@@ -56,13 +54,13 @@ + ERL_DIR := $(shell erl -noshell -eval "io:format([126,115,126,110],[code:root_dir()])" -s erlang halt) + ERL_INCS = -I$(ERL_DIR)/usr/include + +- CC = gcc ++ CC ?= gcc + + endif + + TARGETDIR = ../priv + +-GCC_O = $(CC) -c $(CFLAGS) $< ++GCC_O = $(CC) -c $(CFLAGS) $(INCS) $(ERLINC) $< + + # Files + --- esdl-1.0.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090605020520.8C72D108839>