Date: Thu, 12 Jun 2008 08:41:55 +0400 (MSD) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/124502: [REPOCOPY][PATCH] devel/dumb -> audio/dumb, take maint, fix on amd64 Message-ID: <20080612044155.06F641702D@hades.panopticon> Resent-Message-ID: <200806120450.m5C4o3HC068332@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124502 >Category: ports >Synopsis: [REPOCOPY][PATCH] devel/dumb -> audio/dumb, take maint, fix on amd64 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jun 12 04:50:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 7.0-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD hades.panopticon 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #0: Fri Apr 25 11:18:45 MSD 2008 root@hades.panopticon:/usr/obj/usr/src/sys/HADES i386 >Description: * Move devel/dumb to audio/dumb, where it clearly belongs * Take maintainership * Add -fPIC on 64bit archs, so other software can actually link with -ldumb on !i386 (tested with audacious-dumb on amd64) * Use SF macro * Remove useless debug library This PR also contains patch for audio/audacious-dump, which depends on dumb. Description for it: * Depend on dumb library, instead of test binary * Change path to dumb port according to repocopy * Remove ONLY_FOR_ARCHS=i386, as it will now link with -ldumb without problems on amd64 and (most likely) other architectures Preferred order of updates is: - Repocopy devel/dumb -> audio/dumb - Update audio/dumb with the patch attached - Update audio/audacious-dumb with the other patch attached - Remove devel/dumb Also please don't forget to add MOVED entry :) >How-To-Repeat: >Fix: --- dumb.patch begins here --- diff -ruN dumb.orig/Makefile dumb/Makefile --- dumb.orig/Makefile 2008-06-12 06:11:56.000000000 +0400 +++ dumb/Makefile 2008-06-12 08:14:54.000000000 +0400 @@ -7,12 +7,11 @@ PORTNAME= dumb PORTVERSION= 0.9.3 -PORTREVISION= 1 -CATEGORIES= devel audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= dumb +PORTREVISION= 2 +CATEGORIES= audio +MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org +MAINTAINER= amdmi3@amdmi3.ru COMMENT= IT, XM, S3M and MOD player library USE_GMAKE= yes @@ -28,6 +27,10 @@ MAKE_ARGS= _PORT_ALLEGRO_CFLAGS= .endif +.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64" +CFLAGS+= -fPIC +.endif + MAKE_ENV+= CC="${CC}" pre-configure: diff -ruN dumb.orig/files/patch-Makefile dumb/files/patch-Makefile --- dumb.orig/files/patch-Makefile 2008-06-12 06:11:56.000000000 +0400 +++ dumb/files/patch-Makefile 2008-06-12 06:27:26.000000000 +0400 @@ -1,5 +1,5 @@ ---- ./Makefile.orig Mon Aug 8 02:18:41 2005 -+++ ./Makefile Sun Jun 10 12:13:59 2007 +--- 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.) @@ -55,3 +55,39 @@ 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) diff -ruN dumb.orig/pkg-plist dumb/pkg-plist --- dumb.orig/pkg-plist 2008-06-12 06:11:56.000000000 +0400 +++ dumb/pkg-plist 2008-06-12 06:24:49.000000000 +0400 @@ -4,6 +4,4 @@ include/dumb.h %%ALLEGRO%%include/aldumb.h lib/libdumb.a -lib/libdumbd.a %%ALLEGRO%%lib/libaldmb.a -%%ALLEGRO%%lib/libaldmd.a --- dumb.patch ends here --- --- audacious-dumb.patch begins here --- diff -ruN audacious-dumb.orig/Makefile audacious-dumb/Makefile --- audacious-dumb.orig/Makefile 2008-06-12 08:33:50.000000000 +0400 +++ audacious-dumb/Makefile 2008-06-12 08:34:50.000000000 +0400 @@ -7,7 +7,7 @@ PORTNAME= audacious-dumb PORTVERSION= 0.57 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.netswarm.net/misc/ \ CRITICAL @@ -17,13 +17,11 @@ RUN_DEPENDS= audacious:${PORTSDIR}/multimedia/audacious BUILD_DEPENDS= audacious:${PORTSDIR}/multimedia/audacious \ - dumbout:${PORTSDIR}/devel/dumb + ${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb USE_GMAKE= yes USE_LDCONFIG= yes MAKE_ENV+= CC="${CC}" LOCALBASE="${LOCALBASE}" -ONLY_FOR_ARCHS= i386 - .include <bsd.port.mk> --- audacious-dumb.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?20080612044155.06F641702D>