Attachment #114585 for bug #156254

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




MASTER_SITES=	SF/${PORTNAME}/AllegroGL%20source/${PORTVERSION}
DISTNAME=	alleggl-${PORTVERSION}

MAINTAINER=	utisoft@gmail.com
COMMENT=	OpenGL inteface for Allegro library

LIB_DEPENDS=	alleg.42:${PORTSDIR}/devel/allegro

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}




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)
 

Return to bug 156254

Lines 11-17 Link Here

(-)Makefile (-5 / +1 lines)
11	MASTER_SITES= SF/${PORTNAME}/AllegroGL%20source/${PORTVERSION}	11	MASTER_SITES= SF/${PORTNAME}/AllegroGL%20source/${PORTVERSION}
12	DISTNAME= alleggl-${PORTVERSION}	12	DISTNAME= alleggl-${PORTVERSION}
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= utisoft@gmail.com
15	COMMENT= OpenGL inteface for Allegro library	15	COMMENT= OpenGL inteface for Allegro library
16		16
17	LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro	17	LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro
Lines 31-40 Link Here
31	post-patch:	31	post-patch:
32	@${REINPLACE_CMD} -e 's\|^[[:blank:]]make \|${GMAKE} \|' \	32	@${REINPLACE_CMD} -e 's\|^[[:blank:]]make \|${GMAKE} \|' \
33	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	33	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
34	@${REINPLACE_CMD} -Ee \
35	's\|@INSTALL@ (@INSTALL_(DATA\\|PROGRAM)@) -D\|\1\|; \
36	s\|(CFLAGS) =\|\1 +=\|' \
37	${WRKSRC}/make/makefile.unx
38		34
39	post-install:	35	post-install:
40	@${MKDIR} ${EXAMPLESDIR}	36	@${MKDIR} ${EXAMPLESDIR}

Added Link Here

(-)files/patch-make-makefiles (+107 lines)
1	diff -ruN allegrogl/work/alleggl/make/makefile.all make/makefile.all
2	--- allegrogl/work/alleggl/make/makefile.all 2007-01-06 20:39:09.000000000 +0000
3	+++ make/makefile.all 2011-04-07 15:30:09.579220344 +0100
4	@@ -31,10 +31,6 @@
5	- rm -rf docs/rtf
6	else
7	- del $(LIB_PATH_D)
8	- define RM_EXAMPLES
9	- $(foreach file, $(wildcard $(subst /,\,$(EXAMPLES))), - del $(file)
10	- )
11	- endef
12	- $(RM_EXAMPLES)
13	- @echo Y\|del docs\html\.
14	- rd docs\html
15	@@ -47,7 +43,6 @@
16	PROG_INSTALLER=cp
17	endif
18
19	-install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U)
20	ifdef UNIX_TOOLS
21	define CP_INSTALL
22	$(foreach file, $(HEADERS_U), - $(DATA_INSTALLER) $(file) $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
23	@@ -59,6 +54,7 @@
24	$(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
25	)
26	endef
27	+install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U)
28	ifeq ($(wildcard $(COMPILER_INCLUDE_DIR_U)/allegrogl),)
29	mkdir -p $(COMPILER_INCLUDE_DIR_U)/allegrogl
30	endif
31	@@ -87,33 +83,6 @@
32	@echo -
33	@echo AllegroGL is now installed.
34
35	-uninstall:
36	-ifdef UNIX_TOOLS
37	- define RM_UNINSTALL
38	- $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link))
39	- )
40	- $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
41	- )
42	- $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file))
43	- )
44	- endef
45	- - rm -f $(COMPILER_LIB_DIR_U)/$(notdir $(LIB_PATH_U))
46	- - $(RM_UNINSTALL)
47	- - rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl/GLext
48	- - rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl
49	-else
50	- define RM_UNINSTALL
51	- $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
52	- )
53	- $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file)
54	- )
55	- endef
56	- - $(RM_UNINSTALL)
57	- - rmdir /s /q $(COMPILER_INCLUDE_DIR_D)\allegrogl
58	- - del $(COMPILER_LIB_DIR_D)\$(notdir $(LIB_PATH_U))
59	-endif
60	- @echo -
61	- @echo AllegroGL is uninstalled.
62
63	$(EXT_HEADERS_PATH_U)/gl_ext_alias.h: $(EXT_HEADERS_PATH_U)/gl_ext_api.h
64	ifdef UNIX_TOOLS
65	diff -ruN allegrogl/work/alleggl/make/makefile.unx make/makefile.unx
66	--- allegrogl/work/alleggl/make/makefile.unx 2007-11-10 19:33:06.000000000 +0000
67	+++ make/makefile.unx 2011-04-07 15:31:41.631562520 +0100
68	@@ -28,8 +28,8 @@
69	# Programs
70	CC = @CC@
71	CXX = @CXX@
72	-DATA_INSTALLER = @INSTALL@ @INSTALL_DATA@ -D
73	-PROG_INSTALLER = @INSTALL@ @INSTALL_PROGRAM@ -D
74	+DATA_INSTALLER = @INSTALL_DATA@
75	+PROG_INSTALLER = @INSTALL_PROGRAM@
76
77
78	# Where to install the library and header file
79	@@ -67,13 +67,13 @@
80	# --- Compiler optimizations ---#
81
82	ifdef DEBUGMODE
83	- CFLAGS = -g -W -Wall -Wno-unused
84	+ CFLAGS += -g -W -Wall -Wno-unused
85	CFLAGS += -DDEBUGMODE=$(DEBUGMODE)
86	ifdef LOGLEVEL
87	CFLAGS += -DLOGLEVEL=$(LOGLEVEL)
88	endif
89	else
90	- CFLAGS = -O2 -Wall -ffast-math -fomit-frame-pointer
91	+ CFLAGS += -O2 -Wall -ffast-math -fomit-frame-pointer
92	endif
93
94	ifdef SHARED
95	@@ -149,11 +149,11 @@
96
97	include make/makefile.dep
98
99	-$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT)
100	define MAKE_LINKS
101	$(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(link)
102	)
103	endef
104	+$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT)
105	$(LIB_BUILDER) $@ $^
106	- $(MAKE_LINKS)
107