From f3fbd7f18ef98348417a44f2689f07fab610c263 Mon Sep 17 00:00:00 2001
From: thierry <thierry@FreeBSD.org>
Date: Wed, 28 Apr 2004 20:30:20 +0000
Subject: Fix pkg-plist and install examples. Noticed on dosirak & bento.

Approved by:	mat (mentor).
---
 french/med/Makefile                        | 18 +++++++++----
 french/med/files/patch-Makefile.in         | 19 ++------------
 french/med/files/patch-config::commence.in | 11 +++++++-
 french/med/files/patch-config::conclude.in | 19 ++++++++++++++
 french/med/files/patch-tests::Makefile.in  | 42 ++++++++++++++++++++++++++++++
 french/med/pkg-plist                       | 31 ++++++++++++++++++++++
 6 files changed, 117 insertions(+), 23 deletions(-)
 create mode 100644 french/med/files/patch-config::conclude.in
 create mode 100644 french/med/files/patch-tests::Makefile.in

(limited to 'french/med')

diff --git a/french/med/Makefile b/french/med/Makefile
index 05b88d1f281e..f1bd014ace7b 100644
--- a/french/med/Makefile
+++ b/french/med/Makefile
@@ -29,16 +29,24 @@ USE_REINPLACE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}.src
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/config/commence.in
-
 post-extract:
 	@(cd ${WRKDIR} && \
 	${TAR} xfz ${WRKDIR}/${PORTNAME}${PORTVERSION}.src.tar.gz)
 
+pre-configure:
+	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g'	\
+		${WRKSRC}/config/commence.in
+	@${REINPLACE_CMD} -e 's|@PTHREAD_LIBS@|${PTHREAD_LIBS}|'	\
+		 -e 's|@PTHREAD_CFLAGS@|${PTHREAD_CFLAGS}|'		\
+			${WRKSRC}/tests/Makefile.in
+
+pre-install:
+	@${MKDIR} ${EXAMPLESDIR}
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if defined(NOPORTDOCS)
+	@${RM} -rf ${EXAMPLESDIR}
+.else
 	@${MKDIR} ${DOCSDIR}
 	@${CP} -R ${WRKSRC}/doc/html ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
diff --git a/french/med/files/patch-Makefile.in b/french/med/files/patch-Makefile.in
index 440a5b8dcfb4..e7dafe6eadae 100644
--- a/french/med/files/patch-Makefile.in
+++ b/french/med/files/patch-Makefile.in
@@ -1,21 +1,6 @@
 --- Makefile.in.orig	Wed Nov 20 17:21:36 2002
-+++ Makefile.in	Fri Jun 27 23:01:55 2003
-@@ -8,7 +8,7 @@
- 
- @COMMENCE@
- 
--SUBDIRS=src tests tools doc
-+SUBDIRS=src tools doc
- 
- lib:
- 	@@SETX@; for d in $(SUBDIRS); do				      \
-@@ -30,12 +30,12 @@
- 	   (cd $$d && $(MAKE) $@) || exit 1;				      \
- 	done
- 
--install: lib bin tests
-+install: lib bin
- 	@@SETX@; for d in $(SUBDIRS); do				      \
++++ Makefile.in	Sat Apr 24 21:06:50 2004
+@@ -35,7 +35,7 @@
  	   (cd $$d && $(MAKE) $@) || exit 1;				      \
  	done
  	@$(LT) --mode=finish $(libdir);
diff --git a/french/med/files/patch-config::commence.in b/french/med/files/patch-config::commence.in
index 863a815218ee..a379fe449ae8 100644
--- a/french/med/files/patch-config::commence.in
+++ b/french/med/files/patch-config::commence.in
@@ -1,5 +1,5 @@
 --- config/commence.in.orig	Wed Sep 18 18:09:44 2002
-+++ config/commence.in	Wed Jul 23 11:49:48 2003
++++ config/commence.in	Sat Apr 24 21:17:41 2004
 @@ -28,7 +28,7 @@
  CFLAGS=@CFLAGS@
  CPPFLAGS= -I$(top_srcdir)/include -I$(HDF5INC) -D$(MACHINE) @CPPFLAGS@
@@ -17,3 +17,12 @@
  INSTALL_DATA=@INSTALL_DATA@
  RUNSERIAL=@RUNSERIAL@
  RUNPARALLEL=@RUNPARALLEL@
+@@ -49,7 +50,7 @@
+ libdir=@libdir@
+ includedir=@includedir@
+ docdir=@exec_prefix@/doc
+-testdir=@exec_prefix@/tests
++testdir=@exec_prefix@/share/examples/med/tests
+ PUB_LIB=$(LIB)
+ 
+ # Shared libraries
diff --git a/french/med/files/patch-config::conclude.in b/french/med/files/patch-config::conclude.in
new file mode 100644
index 000000000000..42a6948479b2
--- /dev/null
+++ b/french/med/files/patch-config::conclude.in
@@ -0,0 +1,19 @@
+--- ./config/conclude.in.orig	Wed Sep 18 18:09:44 2002
++++ ./config/conclude.in	Sat Apr 24 22:04:34 2004
+@@ -88,11 +88,11 @@
+ 	   fi;							              \
+ 	done
+ # Install tests programmes in bindir
+-	@for f in X $(TEST_PROGS); do  					      \
+-	   if test $$f != X; then					      \
+-	     ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1);		      \
+-	   fi;							              \
+-	done
++#	@for f in X $(TEST_PROGS); do  					      \
++#	   if test $$f != X; then					      \
++#	     ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1);		      \
++#	   fi;							              \
++#	done
+ # Install sources tests programmes in testdir
+ 	for f in X $(TEST_SRC); do					      \
+ echo $$f;\
diff --git a/french/med/files/patch-tests::Makefile.in b/french/med/files/patch-tests::Makefile.in
new file mode 100644
index 000000000000..01f27085ce4e
--- /dev/null
+++ b/french/med/files/patch-tests::Makefile.in
@@ -0,0 +1,42 @@
+--- tests/Makefile.in.orig	Wed Sep 18 18:09:58 2002
++++ tests/Makefile.in	Sat Apr 24 22:44:52 2004
+@@ -3,7 +3,10 @@
+ top_srcdir=@top_srcdir@
+ top_builddir=..
+ srcdir=@srcdir@
++pthread_cflags=@PTHREAD_CFLAGS@
++pthread_libs=@PTHREAD_LIBS@
+ VPATH=@srcdir@/c:@srcdir@/f
++
+ @COMMENCE@
+ 
+ SRC_C= \
+@@ -38,22 +41,22 @@
+ endif
+ 
+ %_c.out: %_c.o
+-	$(CC) -o $@ $< $(LDFLAGS) -L$(top_builddir)/src/.libs -lmed -lhdf5
++	$(CC) -o $@ $< $(LDFLAGS) $(pthread_libs) -L$(top_builddir)/src/.libs -lmed -lhdf5
+ 
+ %_c.o: %.c
+-	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) $(CFLAGS)
++	$(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) $(CFLAGS) $(pthread_cflags)
+ 
+ %_f.out: %_f.o
+-	$(FC) -o $@ $< $(LDFLAGS) -L$(top_builddir)/src/.libs -lmed -lhdf5
++	$(FC) -o $@ $< $(LDFLAGS) $(pthread_libs) -L$(top_builddir)/src/.libs -lmed -lhdf5
+ 
+ %_f.o: %.f
+-	$(FC) -c -o $@ $< $(FFLAGS)
++	$(FC) -c -o $@ $< $(FFLAGS) $(pthread_cflags)
+ 
+ %_f90.out: %_f90.o
+-	$(F90) $(FFLAGS) -o $@ $< $(LDFLAGS) -L$(top_builddir)/src/.libs -lmed -lhdf5
++	$(F90) $(FFLAGS) -o $@ $< $(LDFLAGS) $(pthread_libs) -L$(top_builddir)/src/.libs -lmed -lhdf5
+ 
+ %_f90.o: %.f90
+-	$(F90) -c -o $@ $< $(FFLAGS)
++	$(F90) -c -o $@ $< $(FFLAGS) $(pthread_cflags)
+ 
+ @CONCLUDE@
+ 
diff --git a/french/med/pkg-plist b/french/med/pkg-plist
index 1f24e759ec05..98f27bcf3c40 100644
--- a/french/med/pkg-plist
+++ b/french/med/pkg-plist
@@ -16,5 +16,36 @@ lib/libmed.a
 %%PORTDOCS%%%%DOCSDIR%%/html/reference_guide.html
 %%PORTDOCS%%%%DOCSDIR%%/html/root.html
 %%PORTDOCS%%%%DOCSDIR%%/html/user_guide.html
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test1.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test1.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test10.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test10.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test11.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test12.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test12.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test13.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test14.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test14.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test15.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test16.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test16.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test17.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test18.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test18.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test2.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test2.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test3.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test3.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test4.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test4.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test5.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test6.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test6.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test7.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test8.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test8.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/tests/test9.c
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tests
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-- 
cgit