Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Feb 2014 21:26:25 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r343154 - in head/audio/timidity: . files
Message-ID:  <201402062126.s16LQPp7036204@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Thu Feb  6 21:26:25 2014
New Revision: 343154
URL: http://svnweb.freebsd.org/changeset/ports/343154
QAT: https://qat.redports.org/buildarchive/r343154/

Log:
  Stage support

Modified:
  head/audio/timidity/Makefile
  head/audio/timidity/files/patch-ab
  head/audio/timidity/pkg-plist

Modified: head/audio/timidity/Makefile
==============================================================================
--- head/audio/timidity/Makefile	Thu Feb  6 20:58:06 2014	(r343153)
+++ head/audio/timidity/Makefile	Thu Feb  6 21:26:25 2014	(r343154)
@@ -16,15 +16,13 @@ CONFLICTS=	timidity++-2.13.*
 
 TIINS=		goemon.tgz
 INSTALL_TARGET=	install.all
-MAN1=		timidity.1
-NO_STAGE=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's,machine/soundcard.h,sys/soundcard.h,' \
 		${WRKSRC}/linux_a.c
 
 post-install:
-	cd ${PREFIX}/lib/timidity && \
+	cd ${STAGEDIR}${PREFIX}/lib/timidity && \
 	${TAR} --no-same-owner --no-same-permissions -zxf ${DISTDIR}/${TIINS} && \
 	${REINPLACE_CMD} -i "" -e 's,dir goemon,dir ${PREFIX}/lib/timidity/goemon,' \
 		goemon.cfg

Modified: head/audio/timidity/files/patch-ab
==============================================================================
--- head/audio/timidity/files/patch-ab	Thu Feb  6 20:58:06 2014	(r343153)
+++ head/audio/timidity/files/patch-ab	Thu Feb  6 21:26:25 2014	(r343154)
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun May 26 13:26:46 1996
-+++ Makefile	Mon Jan  4 04:08:35 1999
+--- ./Makefile.orig	1996-05-26 09:26:46.000000000 +0000
++++ ./Makefile	2014-02-06 21:14:36.000000000 +0000
 @@ -24,22 +24,22 @@
  # But where to change without revealing my secret identity?
  
@@ -66,9 +66,28 @@
  
  ########### Installation targets
  
-@@ -262,9 +262,9 @@
- 	mkdir -p $(TIMID_DIR)
- 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
+@@ -249,22 +249,22 @@
+ 
+ # install.bin: $(PROJ) Dumb make thinks it has to have $(COBJS) to install...
+ install.bin:
+-	mkdir -p $(BIN_DIR)
+-	$(INSTALL) -s -m 755 $(PROJ) $(TOOLS) $(BIN_DIR)
++	mkdir -p $(DESTDIR)$(BIN_DIR)
++	$(INSTALL) -s -m 755 $(PROJ) $(TOOLS) $(DESTDIR)$(BIN_DIR)
+ 
+ install.man:
+-	mkdir -p $(MAN_DIR)
+-	$(INSTALL) -m 644 $(MANPAGES) $(MAN_DIR)
++	mkdir -p $(DESTDIR)$(MAN_DIR)
++	$(INSTALL) -m 644 $(MANPAGES) $(DESTDIR)$(MAN_DIR)
+ 
+ install.lib: install.config install.patch $(INST_TK)
+ 
+ install.config: $(CONFIGF)
+-	mkdir -p $(TIMID_DIR)
+-	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
++	mkdir -p $(DESTDIR)$(TIMID_DIR)
++	$(INSTALL) -m 644 $(CONFIGF) $(DESTDIR)$(TIMID_DIR)
  
 -install.patch: $(PATCHF)
 -	mkdir -p $(TIMID_DIR)/patch

Modified: head/audio/timidity/pkg-plist
==============================================================================
--- head/audio/timidity/pkg-plist	Thu Feb  6 20:58:06 2014	(r343153)
+++ head/audio/timidity/pkg-plist	Thu Feb  6 21:26:25 2014	(r343154)
@@ -258,6 +258,7 @@ lib/timidity/midia.cfg
 lib/timidity/mt32.cfg
 lib/timidity/timidity.cfg
 lib/timidity/wowpats.cfg
+man/man1/timidity.1.gz
 @dirrm lib/timidity/goemon/gsdrum40
 @dirrm lib/timidity/goemon/gsdrum08
 @dirrm lib/timidity/goemon/gsdrum00



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402062126.s16LQPp7036204>