Attachment #181675 for bug #218548

View | Details | Raw Unified | Return to bug 218548 | Differences between
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	cmus
DISTVERSIONPREFIX=	v
DISTVERSION=	2.8.0-rc0
PORTREVISION=	1
CATEGORIES=	audio
DIST_SUBDIR=	cmus


WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack

post-patch:
# From DPorts: prevent passing -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600
	@${REINPLACE_CMD} -e 's@\(NCURSES_CFLAGS=\).*@\1""@g' \
		${WRKSRC}/configure
# Doc/cmus.txt is used to generate the man pages.  Fix paths to point
# to the correct directories.
	@${REINPLACE_CMD} \

		-e 's,/usr/share/cmus,${DATADIR},g' \
		${WRKSRC}/Doc/cmus.txt

post-configure:
# Prevent passing -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 from
# devel/ncurses' pkg-config file to the build
	@${REINPLACE_CMD} -e 's|-D_POSIX_C_SOURCE=200112L||g; s|-D_XOPEN_SOURCE=600||g' \
		${WRKSRC}/config.mk

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cmus*
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cmus/[io]p/*.so




--- configure.orig	2017-04-11 02:34:57 UTC
+++ configure
@@ -126,23 +126,6 @@ check_ncurses()
 	fi
 	test -z "$widechars" && return 1
 
-	msg_checking "for working ncurses setup"
-	for flag in "" "-I/usr/include/ncurses" "-I/usr/include/ncursesw"
-	do
-		if try_compile_link "$ncurses_code" $flag $NCURSES_LIBS
-		then
-			NCURSES_CFLAGS="$NCURSES_CFLAGS $flag"
-			msg_result yes
-			working_curses=y
-			break
-		fi
-	done
-	if test -z "$working_curses"
-	then
-		msg_result no
-		return 1
-	fi
-
 	check_function "resizeterm" $NCURSES_CFLAGS $NCURSES_LIBS
 	HAVE_RESIZETERM=`test $? -ne 0 ; echo $?`
 

Return to bug 218548

Lines 2-9 Link Here

(-)Makefile (-4 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cmus	4	PORTNAME= cmus
		5	DISTVERSIONPREFIX= v
5	DISTVERSION= 2.8.0-rc0	6	DISTVERSION= 2.8.0-rc0
6	DISTVERSIONPREFIX= v	7	PORTREVISION= 1
7	CATEGORIES= audio	8	CATEGORIES= audio
8	DIST_SUBDIR= cmus	9	DIST_SUBDIR= cmus
9		10
Lines 136-144 Link Here
136	WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack	137	WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
137		138
138	post-patch:	139	post-patch:
139	# From DPorts: prevent passing -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600
140	@${REINPLACE_CMD} -e 's@\(NCURSES_CFLAGS=\).*@\1""@g' \
141	${WRKSRC}/configure
142	# Doc/cmus.txt is used to generate the man pages. Fix paths to point	140	# Doc/cmus.txt is used to generate the man pages. Fix paths to point
143	# to the correct directories.	141	# to the correct directories.
144	@${REINPLACE_CMD} \	142	@${REINPLACE_CMD} \
Lines 146-151 Link Here
146	-e 's,/usr/share/cmus,${DATADIR},g' \	144	-e 's,/usr/share/cmus,${DATADIR},g' \
147	${WRKSRC}/Doc/cmus.txt	145	${WRKSRC}/Doc/cmus.txt
148		146
		147	post-configure:
		148	# Prevent passing -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 from
		149	# devel/ncurses' pkg-config file to the build
		150	@${REINPLACE_CMD} -e 's\|-D_POSIX_C_SOURCE=200112L\|\|g; s\|-D_XOPEN_SOURCE=600\|\|g' \
		151	${WRKSRC}/config.mk
		152
149	post-install:	153	post-install:
150	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cmus*	154	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cmus*
151	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cmus/[io]p/*.so	155	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cmus/[io]p/*.so

Line 0 Link Here

(-)files/patch-configure (+26 lines)
	1	--- configure.orig 2017-04-11 02:34:57 UTC
	2	+++ configure
	3	@@ -126,23 +126,6 @@ check_ncurses()
	4	fi
	5	test -z "$widechars" && return 1
	6
	7	- msg_checking "for working ncurses setup"
	8	- for flag in "" "-I/usr/include/ncurses" "-I/usr/include/ncursesw"
	9	- do
	10	- if try_compile_link "$ncurses_code" $flag $NCURSES_LIBS
	11	- then
	12	- NCURSES_CFLAGS="$NCURSES_CFLAGS $flag"
	13	- msg_result yes
	14	- working_curses=y
	15	- break
	16	- fi
	17	- done
	18	- if test -z "$working_curses"
	19	- then
	20	- msg_result no
	21	- return 1
	22	- fi
	23	-
	24	check_function "resizeterm" $NCURSES_CFLAGS $NCURSES_LIBS
	25	HAVE_RESIZETERM=`test $? -ne 0 ; echo $?`
	26