Date: Fri, 20 Aug 2004 00:09:02 +0400 (MSD) From: Igor Pokrovsky <ip@doom.homeunix.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70675: Update port: graphics/oglext 1.0.2 -> 1.1.0 Message-ID: <200408192009.i7JK92Lk045190@doom.homeunix.org> Resent-Message-ID: <200408192010.i7JKATYd055396@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70675 >Category: ports >Synopsis: Update port: graphics/oglext 1.0.2 -> 1.1.0 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Aug 19 20:10:28 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Igor Pokrovsky >Release: FreeBSD 4.10-STABLE i386 >Organization: >Environment: System: FreeBSD doom.homeunix.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Wed Jul 7 12:47:50 MSD 2004 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386 >Description: Update to 1.1.0. Build makefile from tmake's project. Finally no big hacks. >How-To-Repeat: >Fix: --- oglext.diff begins here --- diff -ruN /usr/ports/graphics/oglext/Makefile oglext/Makefile --- /usr/ports/graphics/oglext/Makefile Sun Aug 1 21:23:06 2004 +++ oglext/Makefile Fri Aug 20 00:03:30 2004 @@ -6,7 +6,7 @@ # PORTNAME= oglext -PORTVERSION= 1.0.2 +PORTVERSION= 1.1.0 CATEGORIES= graphics devel MASTER_SITES= http://www.julius.caesar.de/oglext/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -14,6 +14,8 @@ MAINTAINER= ip@doom.homeunix.org COMMENT= A library for easier access to OpenGL extensions +BUILD_DEPENDS= ${LOCALBASE}/bin/tmake:${PORTSDIR}/devel/tmake + USE_ZIP= yes USE_GMAKE= yes USE_GL= yes @@ -24,16 +26,22 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/src -MAKEFILE= ${WRKSRC}/build/linux-gcc/Makefile -MAKE_ENV= AR="${AR}" LN="${LN}" RM="${RM}" +ALL_TARGET= all staticlib + +TMAKE?= ${LOCALBASE}/bin/tmake +TMAKEPATH?= ${LOCALBASE}/share/tmake/freebsd-g++ pre-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e "s/`${PRINTF} '\r'`//" +pre-build: + ${SETENV} TMAKEPATH=${TMAKEPATH} \ + ${TMAKE} ${WRKSRC}/build/OglExt.pro >${BUILD_WRKSRC}/Makefile + do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libOglExt.so.1 ${PREFIX}/lib ${LN} -sf ${PREFIX}/lib/libOglExt.so.1 ${PREFIX}/lib/libOglExt.so - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libOglExt.a ${PREFIX}/lib + ${INSTALL_DATA} ${BUILD_WRKSRC}/libOglExt.a ${PREFIX}/lib # install includes in separate dir to avoid conflicts with Mesa @${MKDIR} ${PREFIX}/include/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/${PORTNAME} diff -ruN /usr/ports/graphics/oglext/distinfo oglext/distinfo --- /usr/ports/graphics/oglext/distinfo Sun May 30 02:08:55 2004 +++ oglext/distinfo Wed Aug 18 23:38:14 2004 @@ -1,2 +1,2 @@ -MD5 (oglext-1.0.2-src.zip) = 569e331cb6131e75e105b9c6a0e4ae6a -SIZE (oglext-1.0.2-src.zip) = 172296 +MD5 (oglext-1.1.0-src.zip) = a450fe4db95960a5e0c98214b36e53b5 +SIZE (oglext-1.1.0-src.zip) = 148224 diff -ruN /usr/ports/graphics/oglext/files/patch-build_OglExt.pro oglext/files/patch-build_OglExt.pro --- /usr/ports/graphics/oglext/files/patch-build_OglExt.pro Thu Jan 1 03:00:00 1970 +++ oglext/files/patch-build_OglExt.pro Fri Aug 20 00:05:16 2004 @@ -0,0 +1,15 @@ +--- build/OglExt.pro.orig Thu Aug 19 23:58:56 2004 ++++ build/OglExt.pro Thu Aug 19 23:59:25 2004 +@@ -2,9 +2,11 @@ + # Tue Jun 15 10:34:01 CET 2004 + + TEMPLATE = lib +-CONFIG += dll warn_on release opengl ++CONFIG = dll warn_on release opengl + TARGET = OglExt + VERSION = 1.1.0 ++ ++INCLUDEPATH= ../include + + SOURCES += \ + OglExt.cpp \ diff -ruN /usr/ports/graphics/oglext/files/patch-build_linux-gcc_Makefile oglext/files/patch-build_linux-gcc_Makefile --- /usr/ports/graphics/oglext/files/patch-build_linux-gcc_Makefile Sun May 30 02:08:55 2004 +++ oglext/files/patch-build_linux-gcc_Makefile Thu Jan 1 03:00:00 1970 @@ -1,91 +0,0 @@ ---- build/linux-gcc/Makefile.orig Mon Feb 2 19:30:41 2004 -+++ build/linux-gcc/Makefile Mon Feb 2 19:34:14 2004 -@@ -8,28 +8,28 @@ - - ####### Compiler, tools and options - --CC = gcc --CXX = g++ --LEX = flex --YACC = yacc --CFLAGS = -pipe -Wall -W -fPIC --CXXFLAGS = -pipe -Wall -W -fPIC --LEXFLAGS = --YACCFLAGS= -d --LINK = g++ -+#CC = gcc -+#CXX = g++ -+#LEX = flex -+#YACC = yacc -+CFLAGS += -pipe -Wall -W -fPIC -I${X11BASE}/include -+CXXFLAGS += -pipe -Wall -W -fPIC -I${X11BASE}/include -+#LEXFLAGS = -+#YACCFLAGS= -d -+LINK = ${CXX} - LFLAGS = -shared -Wl,-soname,libOglExt.so.1 --LIBS = --AR = ar cqs --RANLIB = --TAR = tar -cf --GZIP = gzip -9f --COPY = cp -f --COPY_FILE= $(COPY) -p --COPY_DIR = $(COPY) -pR --DEL_FILE = rm -f --SYMLINK = ln -sf --DEL_DIR = rmdir --MOVE = mv -f -+LIBS = -L${X11BASE}/lib -lGL -+#AR = ${AR} cqs -+#RANLIB = -+#TAR = ${TAR} -cf -+#GZIP = ${GZIP_CMD} -9f -+#COPY = ${CP} -f -+#COPY_FILE= $(COPY) -p -+#COPY_DIR = $(COPY) -pR -+DEL_FILE = ${RM} -f -+SYMLINK = ${LN} -sf -+#DEL_DIR = ${RMDIR} -+#MOVE = ${MV} -f - - ####### Output directory - -@@ -45,12 +45,12 @@ - RenderingContext.cpp - OBJECTS = OglExt.o \ - RenderingContext.o --TARGET = libOglExt.so.1.0.0 -+TARGET = libOglExt.so.1 - TARGETA = libOglExt.a --TARGETD = libOglExt.so.1.0.0 --TARGET0 = libOglExt.so --TARGET1 = libOglExt.so.1 --TARGET2 = libOglExt.so.1.0 -+#TARGETD = libOglExt.so.1.0.0 -+#TARGET0 = libOglExt.so -+#TARGET1 = libOglExt.so.1 -+#TARGET2 = libOglExt.so.1.0 - - first: all - ####### Implicit rules -@@ -74,15 +74,15 @@ - - ####### Build rules - --all: Makefile $(TARGET) -+all: $(TARGET) $(TARGETA) - - $(TARGET): $(OBJECTS) -- -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) -+ -$(DEL_FILE) $(TARGET) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) -- -ln -s $(TARGET) $(TARGET0) -- -ln -s $(TARGET) $(TARGET1) -- -ln -s $(TARGET) $(TARGET2) - -+$(TARGETA): $(OBJECTS) -+ -$(DEL_FILE) $(TARGETA) -+ $(AR) cqs $@ $(OBJECTS) - - clean: - -$(DEL_FILE) $(OBJECTS) diff -ruN /usr/ports/graphics/oglext/files/patch-src_Macros.h oglext/files/patch-src_Macros.h --- /usr/ports/graphics/oglext/files/patch-src_Macros.h Sun May 30 02:08:55 2004 +++ oglext/files/patch-src_Macros.h Thu Aug 19 23:20:49 2004 @@ -1,10 +1,9 @@ ---- src/Macros.h.orig Mon Feb 2 19:23:57 2004 -+++ src/Macros.h Mon Feb 2 19:24:13 2004 -@@ -18,7 +18,7 @@ - #define _OGL_MACROS_H_ +--- src/Macros.h.orig Thu Aug 19 23:19:51 2004 ++++ src/Macros.h Thu Aug 19 23:20:28 2004 +@@ -19,6 +19,7 @@ + + #if !defined(_WIN32) && (!defined(__APPLE__) || !defined(__GNUC__)) && !defined(__MACOSX__) - #ifndef _WIN32 -- + #define GLX_GLXEXT_PROTOTYPES #include <GL/glx.h> --- oglext.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408192009.i7JK92Lk045190>