diff options
| author | glewis <glewis@FreeBSD.org> | 2004-12-16 07:08:25 +0000 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2004-12-16 07:08:25 +0000 |
| commit | 619b0743201a7bf9577a67587a3b5ecb415c23b6 (patch) | |
| tree | 45e33276df9593c398146dcd084db6a47a9f87f8 /math/ndiff | |
| parent | a6922bd6691408b4518c0563532a5633dd96d541 (diff) | |
| download | FreeBSD-ports-619b0743201a7bf9577a67587a3b5ecb415c23b6.zip FreeBSD-ports-619b0743201a7bf9577a67587a3b5ecb415c23b6.tar.gz | |
. Respect hier(7).
. Use a better ALL_TARGET. Having check as part of it tried to install
some files. Use check-runs to achieve the desired testing without
doing any installation.
. ${INSTALL_MAN} -> ${INSTALL_DATA} for doc installation (they aren't
manual pages).
Diffstat (limited to 'math/ndiff')
| -rw-r--r-- | math/ndiff/Makefile | 12 | ||||
| -rw-r--r-- | math/ndiff/files/patch-Makefile.in | 31 | ||||
| -rw-r--r-- | math/ndiff/pkg-plist | 6 |
3 files changed, 35 insertions, 14 deletions
diff --git a/math/ndiff/Makefile b/math/ndiff/Makefile index 5801a22..16aefc9 100644 --- a/math/ndiff/Makefile +++ b/math/ndiff/Makefile @@ -33,14 +33,18 @@ CONFIGURE_ARGS= --with-double .endif .endif +USE_REINPLACE= yes GNU_CONFIGURE= yes -ALL_TARGET= all check +ALL_TARGET= all check-runs MAN1= ndiff.1 .if !defined(NOPORTDOCS) PORTDOCS= * .endif +post-patch: + @${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:g" ${WRKSRC}/Makefile.in + post-build: @${ECHO_MSG} "If there were no errors in the above checks then type" @${ECHO_MSG} @@ -51,9 +55,9 @@ post-build: post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.pdf ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.ps ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.html ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.pdf ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ps ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.html ${DOCSDIR} .endif .include <bsd.port.post.mk> diff --git a/math/ndiff/files/patch-Makefile.in b/math/ndiff/files/patch-Makefile.in index 6d2926c..97f77a1 100644 --- a/math/ndiff/files/patch-Makefile.in +++ b/math/ndiff/files/patch-Makefile.in @@ -1,6 +1,16 @@ ---- Makefile.in.orig Wed Feb 18 14:17:22 2004 -+++ Makefile.in Wed Feb 18 14:19:31 2004 -@@ -191,9 +191,9 @@ +--- Makefile.in.orig Tue Dec 12 11:11:11 2000 ++++ Makefile.in Wed Dec 15 23:53:21 2004 +@@ -64,8 +64,7 @@ + catdir = $(prefix)/man/cat$(manext) + mandir = $(prefix)/man/man$(manext) + manext = 1 +-shrlibdir = $(shrlibtop)/$(PROGNAME)-$(VERSION) +-shrlibtop = $(prefix)/share/lib/$(PROGNAME) ++shrlibdir = %%DATADIR%% + + FTPDIR = /u/ftp/pub/misc + +@@ -191,9 +190,9 @@ DEFINES = -DVERSION='"@VERSION@"' -DDATE='"@DATE@"' $(XDEFINES) @@ -12,7 +22,7 @@ LIBS = @LIBS@ $(XLIBS) -@@ -602,14 +602,12 @@ +@@ -602,14 +601,12 @@ if test -f $(PROGNAME) ; \ then \ $(CP) $(PROGNAME) $(bindir)/$(PROGNAME) ; \ @@ -28,7 +38,7 @@ done ; \ fi -@@ -635,7 +633,7 @@ +@@ -635,15 +632,13 @@ install-show: @echo '' @echo Installed files... @@ -37,7 +47,16 @@ @$(LS) -l $(mandir)/$(PROGNAME).$(manext) @if test -d $(shrlibdir) ; then $(LS) -lR $(shrlibdir)/* ; fi @echo '' -@@ -703,7 +701,7 @@ + + install-shrlib: uninstall-shrlib +- -$(MKDIR) $(shrlibtop) +- @if test -d $(shrlibtop) ; then true ; else echo Cannot create $(shrlibtop) ; exit 1 ; fi +- -$(MKDIR) $(shrlibdir) ++ -$(MKDIR) -p $(shrlibdir) + @if test -d $(shrlibdir) ; then true ; else echo Cannot create $(shrlibdir) ; exit 1 ; fi + for f in $(SHRLIBFILES) ; \ + do \ +@@ -703,7 +698,7 @@ uninstall-exe: -for f in $(PROGRAMS) ; \ do \ diff --git a/math/ndiff/pkg-plist b/math/ndiff/pkg-plist index b0ff6fe..0177eb1 100644 --- a/math/ndiff/pkg-plist +++ b/math/ndiff/pkg-plist @@ -1,5 +1,3 @@ bin/ndiff -share/lib/ndiff/ndiff-2.00/ndiff.awk -@dirrm share/lib/ndiff/ndiff-2.00 -@dirrm share/lib/ndiff -@dirrm share/lib +%%DATADIR%%/ndiff.awk +@dirrm %%DATADIR%% |
