Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Jan 2016 14:54:44 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r407528 - in head/audio/timidity: . files
Message-ID:  <201601301454.u0UEsiwr056491@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat Jan 30 14:54:44 2016
New Revision: 407528
URL: https://svnweb.freebsd.org/changeset/ports/407528

Log:
  audio/timidy: Respect LDFLAGS, document ncurses requirement

Modified:
  head/audio/timidity/Makefile
  head/audio/timidity/files/patch-Makefile

Modified: head/audio/timidity/Makefile
==============================================================================
--- head/audio/timidity/Makefile	Sat Jan 30 14:24:38 2016	(r407527)
+++ head/audio/timidity/Makefile	Sat Jan 30 14:54:44 2016	(r407528)
@@ -16,7 +16,7 @@ CONFLICTS=	timidity++-2.*
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		alias
+USES=		alias ncurses
 TIINS=		goemon.tgz
 INSTALL_TARGET=	install.all
 

Modified: head/audio/timidity/files/patch-Makefile
==============================================================================
--- head/audio/timidity/files/patch-Makefile	Sat Jan 30 14:24:38 2016	(r407527)
+++ head/audio/timidity/files/patch-Makefile	Sat Jan 30 14:54:44 2016	(r407528)
@@ -1,5 +1,5 @@
---- ./Makefile.orig	1996-05-26 09:26:46.000000000 +0000
-+++ ./Makefile	2014-02-06 21:14:36.000000000 +0000
+--- Makefile.orig	1996-05-26 09:26:46 UTC
++++ Makefile
 @@ -24,22 +24,22 @@
  # But where to change without revealing my secret identity?
  
@@ -29,7 +29,7 @@
  
  # Where to install the Tcl code, if you use the Tcl code that is.
  TCL_DIR = $(TIMID_DIR)
-@@ -112,9 +112,9 @@
+@@ -112,9 +112,9 @@ EXTRALIBS += -lncurses
  #EXTRALIBS += -lgen
  
  # Select the Tcl/Tk interface
@@ -42,7 +42,7 @@
  #EXTRAINCS +=
  #EXTRALIBS +=
  
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ DISTZIP = timid$(FNVERSION).zip
  SDIST = timidity-lib-$(SUPPVERSION).tar.gz
  SDISTZIP = tilib$(FNSUPPVERSION).zip
  
@@ -51,7 +51,16 @@
  	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
  
  ########### All relevant files.. Anybody know autoconf?
-@@ -228,10 +228,10 @@
+@@ -220,7 +220,7 @@ spotless: clean
+ 	$(CC) $(CFLAGS) -c $<
+ 
+ $(PROJ): $(COBJS)
+-	$(CC) $(CFLAGS) -o $(PROJ) $(COBJS) $(EXTRALIBS) -lm
++	$(CC) $(CFLAGS) -o $(PROJ) $(COBJS) $(LDFLAGS) $(EXTRALIBS) -lm
+ 
+ bag: bag.c
+ 	$(CC) $(CFLAGS) -o bag bag.c
+@@ -228,10 +228,10 @@ bag: bag.c
  wav2pat: wav2pat.c
  	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
  
@@ -66,7 +75,7 @@
  
  ########### Installation targets
  
-@@ -249,22 +249,22 @@
+@@ -249,22 +249,22 @@ install.all: install.bin install.man ins
  
  # install.bin: $(PROJ) Dumb make thinks it has to have $(COBJS) to install...
  install.bin:



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