View | Details | Raw Unified | Return to bug 206895 | Differences between
and this patch

Collapse All | Expand All

(-)math/fxt/Makefile (-11 / +12 lines)
Lines 2-34 Link Here
2
# $FreeBSD: head/math/fxt/Makefile 405387 2016-01-06 19:48:08Z pawel $
2
# $FreeBSD: head/math/fxt/Makefile 405387 2016-01-06 19:48:08Z pawel $
3
3
4
PORTNAME=	fxt
4
PORTNAME=	fxt
5
PORTVERSION=	2015.07.17
5
PORTVERSION=	2016.01.10
6
PORTREVISION=	1
7
CATEGORIES=	math
6
CATEGORIES=	math
8
MASTER_SITES=	http://www.jjj.de/fxt/
7
MASTER_SITES=	http://www.jjj.de/fxt/
9
8
10
MAINTAINER=	ports@FreeBSD.org
9
MAINTAINER=	ports@FreeBSD.org
11
COMMENT=	FFT code and related stuff
10
COMMENT=	FFT code and related stuff
12
11
13
LICENSE=	GPLv3
12
LICENSE=	GPLv3+
13
LICENSE_FILE=	${WRKSRC}/COPYING.txt
14
14
15
WRKSRC=		${WRKDIR}/${PORTNAME}
15
WRKSRC=		${WRKDIR}/${PORTNAME}
16
16
17
USES=		gmake tar:tgz
17
USES=		gmake tar:tgz
18
MAKE_ENV=	FXT_INSTALL="${INSTALL_DATA}"
18
MAKEFILE=	makefile
19
MAKEFILE=	makefile
19
20
20
OPTIONS_DEFINE=	EXAMPLES
21
OPTIONS_DEFINE=	EXAMPLES
21
22
22
post-patch:
23
post-patch:
23
	@${REINPLACE_CMD} -E \
24
	@${REINPLACE_CMD} -e \
24
		-e 's,^(FXT_CXXFLAGS),#\1,' \
25
		's|^\(FXT_CXXFLAGS\)|#\1| ; \
25
		-e 's,^(CXXFLAGS),#\1,' \
26
		 s|\([[:space:]]\)\($$(INCDIR)\)|\1$$(DESTDIR)\2|g ; \
26
		 ${WRKSRC}/makefile
27
		 s|\([[:space:]]\)\($$(LIBDIR)\)|\1$$(DESTDIR)\2|g' \
27
	@${REINPLACE_CMD} -e 's|sinl|Sin|g' ${WRKSRC}/src/aux0/trigrec.h
28
		${WRKSRC}/makefile
28
	@${REINPLACE_CMD} -e 's|sinl|sin|g' ${WRKSRC}/src/fht/hartleyshift.h
29
29
30
post-install-EXAMPLES-on:
30
post-install-EXAMPLES-on:
31
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
31
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
32
	(cd ${WRKSRC}/demo && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/)
32
	@(cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . \
33
		${STAGEDIR}${EXAMPLESDIR})
33
34
34
.include <bsd.port.mk>
35
.include <bsd.port.mk>
(-)math/fxt/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (fxt-2015.07.17.tgz) = 516f7b1bfd8df05ce5696ba2773662ca6cdc550024dd3d8012dc341b19f648ad
1
SHA256 (fxt-2016.01.10.tgz) = 2e229a966520ce54ec644b45f7c493e6f6b07ddb5452234aa27e32d84172e8cc
2
SIZE (fxt-2015.07.17.tgz) = 1810832
2
SIZE (fxt-2016.01.10.tgz) = 1825576
(-)math/fxt/files/patch-makefile (-22 lines)
Lines 1-22 Link Here
1
--- makefile.orig	2015-07-18 10:34:30 UTC
2
+++ makefile
3
@@ -197,13 +197,13 @@ install: lib
4
 	: '[$@]'
5
 	@echo 'PREFIX=$(PREFIX)  LIBDIR=$(LIBDIR)  INCDIR=$(INCDIR)'
6
 	@:
7
-	@test -d $(INCDIR)  ||  mkdir $(INCDIR)
8
-	@$(FXT_INSTALL) $(FXTIDIR)/*.h $(INCDIR)/
9
-	@cd src && for f in $(SHFXTSRCDIRS); do mkdir -p $(INCDIR)/$$f; done
10
-	@cd src && for f in $(SHFXTSRCDIRS); do $(FXT_INSTALL) $$f/*.h $(INCDIR)/$$f; done
11
+	@test -d $(DESTDIR)$(INCDIR)  ||  mkdir $(DESTDIR)$(INCDIR)
12
+	@$(FXT_INSTALL) $(FXTIDIR)/*.h $(DESTDIR)$(INCDIR)/
13
+	@cd src && for f in $(SHFXTSRCDIRS); do mkdir -p $(DESTDIR)$(INCDIR)/$$f; done
14
+	@cd src && for f in $(SHFXTSRCDIRS); do $(FXT_INSTALL) $$f/*.h $(DESTDIR)$(INCDIR)/$$f; done
15
 	@:
16
-	@test -d $(LIBDIR)  ||  mkdir $(LIBDIR)
17
-	@$(FXT_INSTALL) $(FXTLIB) $(LIBDIR)/
18
+	@test -d $(DESTDIR)$(LIBDIR)  ||  mkdir $(DESTDIR)$(LIBDIR)
19
+	@$(FXT_INSTALL) $(FXTLIB) $(DESTDIR)$(LIBDIR)/
20
 	: '[$@ OK]'
21
 
22
 .PHONY: chk-install ##x print whether installed header files are up to date

Return to bug 206895