Attachment #87819 for bug #124502





PORTNAME=	dumb
PORTVERSION=	0.9.3
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	dumb

MAINTAINER=	amdmi3@amdmi3.ru
COMMENT=	IT, XM, S3M and MOD player library

USE_GMAKE=	yes

MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS=
.endif

.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
CFLAGS+=	-fPIC
.endif

MAKE_ENV+=	CC="${CC}"

pre-configure:




--- Makefile.orig	2005-08-08 04:18:41.000000000 +0400
+++ Makefile	2008-06-12 06:27:26.000000000 +0400
@@ -22,7 +22,7 @@
 #                    (Note that this is unable to delete the dumbask
 #                    executable if the configuration is absent.)

 
 LDFLAGS := -s
 
@@ -251,8 +248,8 @@
 ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.a
 
 
-core: $(CORE_LIB_FILE_RELEASE) $(CORE_LIB_FILE_DEBUG)
-allegro: $(ALLEGRO_LIB_FILE_RELEASE) $(ALLEGRO_LIB_FILE_DEBUG)
+core: $(CORE_LIB_FILE_RELEASE)
+allegro: $(ALLEGRO_LIB_FILE_RELEASE)
 
 core-examples: $(CORE_EXAMPLES_EXE)
 allegro-examples: $(ALLEGRO_EXAMPLES_EXE)
@@ -263,11 +260,9 @@
 
 install-core: core
 	$(call COPY,$(CORE_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
-	$(call COPY,$(CORE_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
 
 install-allegro: allegro
 	$(call COPY,$(ALLEGRO_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
-	$(call COPY,$(ALLEGRO_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
 
 ifeq "$(COMSPEC)" ""
 install-core-examples: core-examples
@@ -321,12 +316,6 @@
 ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.a
 include make/Makefile.inc
 
-OBJDIR := $(OBJDIR_BASE)/debug
-CFLAGS := $(CFLAGS_DEBUG)
-CORE_LIB_FILE := $(LIBDIR)/libdumbd.a
-ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.a
-include make/Makefile.inc
-
 
 $(CORE_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(CORE_LIB_FILE_RELEASE)
 	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)

Lines 4-9 Link Here

(-)dumb/pkg-plist (-2 lines)
4	include/dumb.h	4	include/dumb.h
5	%%ALLEGRO%%include/aldumb.h	5	%%ALLEGRO%%include/aldumb.h
6	lib/libdumb.a	6	lib/libdumb.a
7	lib/libdumbd.a
8	%%ALLEGRO%%lib/libaldmb.a	7	%%ALLEGRO%%lib/libaldmb.a
9	%%ALLEGRO%%lib/libaldmd.a

Return to bug 124502

Lines 7-18 Link Here

(-)dumb/Makefile (-5 / +8 lines)
7		7
8	PORTNAME= dumb	8	PORTNAME= dumb
9	PORTVERSION= 0.9.3	9	PORTVERSION= 0.9.3
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= devel audio	11	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= SF
13	MASTER_SITE_SUBDIR= dumb
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= amdmi3@amdmi3.ru
16	COMMENT= IT, XM, S3M and MOD player library	15	COMMENT= IT, XM, S3M and MOD player library
17		16
18	USE_GMAKE= yes	17	USE_GMAKE= yes
Lines 28-33 Link Here
28	MAKE_ARGS= _PORT_ALLEGRO_CFLAGS=	27	MAKE_ARGS= _PORT_ALLEGRO_CFLAGS=
29	.endif	28	.endif
30		29
		30	.if ${ARCH} == "amd64" \|\| ${ARCH} == "ia64" \|\| ${ARCH} == "sparc64"
		31	CFLAGS+= -fPIC
		32	.endif
		33
31	MAKE_ENV+= CC="${CC}"	34	MAKE_ENV+= CC="${CC}"
32		35
33	pre-configure:	36	pre-configure:

Lines 1-5 Link Here

(-)dumb/files/patch-Makefile (-2 / +38 lines)
1	--- ./Makefile.orig Mon Aug 8 02:18:41 2005	1	--- Makefile.orig 2005-08-08 04:18:41.000000000 +0400
2	+++ ./Makefile Sun Jun 10 12:13:59 2007	2	+++ Makefile 2008-06-12 06:27:26.000000000 +0400
3	@@ -22,7 +22,7 @@	3	@@ -22,7 +22,7 @@
4	# (Note that this is unable to delete the dumbask	4	# (Note that this is unable to delete the dumbask
5	# executable if the configuration is absent.)	5	# executable if the configuration is absent.)
Lines 55-57 Link Here
55		55
56	LDFLAGS := -s	56	LDFLAGS := -s
57		57
		58	@@ -251,8 +248,8 @@
		59	ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.a
		60
		61
		62	-core: $(CORE_LIB_FILE_RELEASE) $(CORE_LIB_FILE_DEBUG)
		63	-allegro: $(ALLEGRO_LIB_FILE_RELEASE) $(ALLEGRO_LIB_FILE_DEBUG)
		64	+core: $(CORE_LIB_FILE_RELEASE)
		65	+allegro: $(ALLEGRO_LIB_FILE_RELEASE)
		66
		67	core-examples: $(CORE_EXAMPLES_EXE)
		68	allegro-examples: $(ALLEGRO_EXAMPLES_EXE)
		69	@@ -263,11 +260,9 @@
		70
		71	install-core: core
		72	$(call COPY,$(CORE_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
		73	- $(call COPY,$(CORE_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
		74
		75	install-allegro: allegro
		76	$(call COPY,$(ALLEGRO_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
		77	- $(call COPY,$(ALLEGRO_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
		78
		79	ifeq "$(COMSPEC)" ""
		80	install-core-examples: core-examples
		81	@@ -321,12 +316,6 @@
		82	ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.a
		83	include make/Makefile.inc
		84
		85	-OBJDIR := $(OBJDIR_BASE)/debug
		86	-CFLAGS := $(CFLAGS_DEBUG)
		87	-CORE_LIB_FILE := $(LIBDIR)/libdumbd.a
		88	-ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.a
		89	-include make/Makefile.inc
		90	-
		91
		92	$(CORE_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(CORE_LIB_FILE_RELEASE)
		93	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)