Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Nov 2016 15:56:54 +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: r426382 - in head/audio/gramofile: . files
Message-ID:  <201611191556.uAJFusZq034905@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat Nov 19 15:56:53 2016
New Revision: 426382
URL: https://svnweb.freebsd.org/changeset/ports/426382

Log:
  audio/gramofile: Document ncurses requirement and honor CFLAGS
  
  While here, add DragonFly support

Added:
  head/audio/gramofile/files/patch-bplaysrc_shmbuf.c   (contents, props changed)
Modified:
  head/audio/gramofile/Makefile

Modified: head/audio/gramofile/Makefile
==============================================================================
--- head/audio/gramofile/Makefile	Sat Nov 19 15:11:28 2016	(r426381)
+++ head/audio/gramofile/Makefile	Sat Nov 19 15:56:53 2016	(r426382)
@@ -17,7 +17,7 @@ COMMENT=	Audio recording and tick/scratc
 LIB_DEPENDS=	libfftw.so:math/fftw
 
 ALL_TARGET=	gramofile
-USES=		gmake perl5
+USES=		alias gmake ncurses perl5
 USE_CSTD=	gnu89
 MAKE_ARGS=	CC="${CC}" \
 		CXX="${CXX}" \
@@ -35,11 +35,12 @@ post-patch:
 	for i in `${LS} ${FILESDIR}/post-patch-* |${SED} /.orig$$/d`; do \
 		${PATCH} -d ${WRKSRC} --forward --quiet <$$i ;\
 	done
-.for file in bplay.c sndfunc.c
-	@${SED} -e 's,machine/soundcard.h,sys/soundcard.h,' < \
-		${WRKSRC}/bplaysrc/${file} > ${WRKSRC}/bplaysrc/${file}.new
-	@${MV} ${WRKSRC}/bplaysrc/${file}.new ${WRKSRC}/bplaysrc/${file}
-.endfor
+	${REINPLACE_CMD} -e "s@-lncurses@-L${LOCALBASE}/lib -lncurses@g" \
+		-e "s|CFLAGS =|CFLAGS +=|" \
+		${WRKSRC}/bplaysrc/Makefile
+	${REINPLACE_CMD} -e 's,machine/soundcard.h,sys/soundcard.h,' \
+		${WRKSRC}/bplaysrc/bplay.c \
+		${WRKSRC}/bplaysrc/sndfunc.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gramofile ${WRKSRC}/bplay_gramo \

Added: head/audio/gramofile/files/patch-bplaysrc_shmbuf.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/gramofile/files/patch-bplaysrc_shmbuf.c	Sat Nov 19 15:56:53 2016	(r426382)
@@ -0,0 +1,18 @@
+--- bplaysrc/shmbuf.c.orig	2000-03-27 21:38:56 UTC
++++ bplaysrc/shmbuf.c
+@@ -142,6 +142,7 @@ void init_shm(void)
+     if(shmctl(shmid2, IPC_RMID, NULL))
+ 	ErrDie("shmctl");
+ 
++#ifndef __DragonFly__
+ #if USEBUFFLOCK
+ 	/* Ok, go root to lock the buffers down */
+     if(setreuid(geteuid(), getuid()) == -1)
+@@ -173,6 +174,7 @@ void init_shm(void)
+     }
+ 
+ #endif
++#endif
+     /* Set up the appropriate number of semaphore blocks */
+     numsemblks = numbuffs/SEMMSL;
+     if((numsemblks * SEMMSL) < numbuffs)



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