Attachment 114585 Details for Bug 156254 – allegrogl-gmake-fix.diff

[patch] allegrogl-gmake-fix.diff

allegrogl-gmake-fix.diff (text/plain), 4.53 KB, created by Chris Rees on 2011-04-07 17:10:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Rees

Created: 2011-04-07 17:10:13 UTC

Size: 4.53 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /exports/cvsroot-freebsd/ports/graphics/allegrogl/Makefile,v
>retrieving revision 1.19
>diff -u -r1.19 Makefile
>--- Makefile	27 Feb 2011 04:54:38 -0000	1.19
>+++ Makefile	7 Apr 2011 14:43:25 -0000
>@@ -11,7 +11,7 @@
> MASTER_SITES=	SF/${PORTNAME}/AllegroGL%20source/${PORTVERSION}
> DISTNAME=	alleggl-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	utisoft@gmail.com
> COMMENT=	OpenGL inteface for Allegro library
> 
> LIB_DEPENDS=	alleg.42:${PORTSDIR}/devel/allegro
>@@ -31,10 +31,6 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's|^[[:blank:]]make |${GMAKE} |' \
> 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>-	@${REINPLACE_CMD} -Ee \
>-		's|@INSTALL@ (@INSTALL_(DATA\|PROGRAM)@) -D|\1|; \
>-		 s|(CFLAGS) =|\1 +=|' \
>-		 ${WRKSRC}/make/makefile.unx
> 
> post-install:
> 	@${MKDIR} ${EXAMPLESDIR}
>Index: files/patch-make-makefiles
>===================================================================
>RCS file: files/patch-make-makefiles
>diff -N files/patch-make-makefiles
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-make-makefiles	7 Apr 2011 14:43:25 -0000
>@@ -0,0 +1,107 @@
>+diff -ruN allegrogl/work/alleggl/make/makefile.all make/makefile.all
>+--- allegrogl/work/alleggl/make/makefile.all	2007-01-06 20:39:09.000000000 +0000
>++++ make/makefile.all	2011-04-07 15:30:09.579220344 +0100
>+@@ -31,10 +31,6 @@
>+ 	- rm -rf docs/rtf
>+ else
>+ 	- del $(LIB_PATH_D)
>+-   define RM_EXAMPLES
>+-      $(foreach file, $(wildcard $(subst /,\,$(EXAMPLES))), - del $(file)
>+-      )
>+-   endef
>+ 	- $(RM_EXAMPLES)
>+ 	- @echo Y|del docs\html\*.*
>+ 	- rd docs\html
>+@@ -47,7 +43,6 @@
>+   PROG_INSTALLER=cp
>+ endif
>+ 
>+-install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U)
>+ ifdef UNIX_TOOLS
>+    define CP_INSTALL
>+       $(foreach file, $(HEADERS_U), - $(DATA_INSTALLER) $(file) $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
>+@@ -59,6 +54,7 @@
>+       $(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
>+       )
>+    endef
>++install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U)
>+       ifeq ($(wildcard $(COMPILER_INCLUDE_DIR_U)/allegrogl),)
>+ 	mkdir -p $(COMPILER_INCLUDE_DIR_U)/allegrogl
>+       endif
>+@@ -87,33 +83,6 @@
>+ 	@echo -
>+ 	@echo AllegroGL is now installed.
>+ 
>+-uninstall:
>+-ifdef UNIX_TOOLS
>+-   define RM_UNINSTALL
>+-      $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
>+-      )
>+-      $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
>+-      )
>+-      $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
>+-      )
>+-   endef
>+-	- rm -f $(COMPILER_LIB_DIR_U)/$(notdir $(LIB_PATH_U))
>+-	- $(RM_UNINSTALL)
>+-	- rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl/GLext
>+-	- rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl
>+-else
>+-   define RM_UNINSTALL
>+-      $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
>+-      )
>+-      $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
>+-      )
>+-   endef
>+-	- $(RM_UNINSTALL)
>+-	- rmdir /s /q $(COMPILER_INCLUDE_DIR_D)\allegrogl
>+-	- del $(COMPILER_LIB_DIR_D)\$(notdir $(LIB_PATH_U))
>+-endif
>+-	@echo -
>+-	@echo AllegroGL is uninstalled.
>+ 
>+ $(EXT_HEADERS_PATH_U)/gl_ext_alias.h: $(EXT_HEADERS_PATH_U)/gl_ext_api.h
>+ ifdef UNIX_TOOLS
>+diff -ruN allegrogl/work/alleggl/make/makefile.unx make/makefile.unx
>+--- allegrogl/work/alleggl/make/makefile.unx	2007-11-10 19:33:06.000000000 +0000
>++++ make/makefile.unx	2011-04-07 15:31:41.631562520 +0100
>+@@ -28,8 +28,8 @@
>+ # Programs
>+ CC = @CC@
>+ CXX = @CXX@
>+-DATA_INSTALLER = @INSTALL@ @INSTALL_DATA@ -D
>+-PROG_INSTALLER = @INSTALL@ @INSTALL_PROGRAM@ -D
>++DATA_INSTALLER = @INSTALL_DATA@
>++PROG_INSTALLER = @INSTALL_PROGRAM@
>+ 
>+ 
>+ # Where to install the library and header file
>+@@ -67,13 +67,13 @@
>+ # --- Compiler optimizations ---#
>+ 
>+ ifdef DEBUGMODE
>+-	CFLAGS = -g -W -Wall -Wno-unused
>++	CFLAGS += -g -W -Wall -Wno-unused
>+ 	CFLAGS += -DDEBUGMODE=$(DEBUGMODE)
>+ 	ifdef LOGLEVEL
>+ 		CFLAGS += -DLOGLEVEL=$(LOGLEVEL)
>+ 	endif
>+ else
>+-	CFLAGS = -O2 -Wall -ffast-math -fomit-frame-pointer
>++	CFLAGS += -O2 -Wall -ffast-math -fomit-frame-pointer
>+ endif
>+ 
>+ ifdef SHARED
>+@@ -149,11 +149,11 @@
>+ 
>+ include make/makefile.dep
>+ 
>+-$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT)
>+    define MAKE_LINKS
>+ 	$(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(link)
>+ 	)
>+    endef
>++$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT)
>+ 	$(LIB_BUILDER) $@ $^
>+ 	- $(MAKE_LINKS)
>+

Actions: View | Diff

Attachments on bug 156254: 114585