- Support CFLAGS properly

- Fix configure error
- Fix pkg-plist
- Support NOPORTDOCS

PR:		26550
Submitted by:	tkato@prontomail.ne.jp

4 files changed, 25 insertions, 42 deletions

diff --git a/devel/uds/Makefile b/devel/uds/Makefile
index dcd3587c13f8..94d8e7a47cbb 100644
--- a/devel/uds/Makefile
+++ b/devel/uds/Makefile
@@ -13,18 +13,24 @@ MASTER_SITES=	http://frost.flewid.de/dist/
 
 MAINTAINER=	ijliao@FreeBSD.org
 
-USE_AUTOMAKE=	yes
-USE_AUTOCONF=	yes
+USE_NEWGCC=	yes
+USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-debug
+INSTALLS_SHLIB=	yes
 
-USE_GMAKE=	yes
-USE_NEWGCC=	yes
+pre-patch:
+	@${PERL} -pi -e 's|\$$OPTFLAGS|\$$CFLAGS|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
-INSTALLS_SHLIB=	yes
+	@find ${WRKSRC} -name 'Makefile.in' | xargs ${PERL} -pi -e \
+		's|install-data-hook|#install-data-hook|g ; \
+		 s|-D_REENTRANT|-D_REENTRANT ${PTHREAD_CFLAGS}|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g'
 
-post-patch:
-	@${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/thread/Makefile.am
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/uds
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/uds
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/uds/files/patch-Makefile.am b/devel/uds/files/patch-Makefile.am
deleted file mode 100644
index d307972c3d50..000000000000
--- a/devel/uds/files/patch-Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.am.orig	Mon Apr  2 20:06:43 2001
-+++ Makefile.am	Mon Apr  2 20:07:20 2001
-@@ -12,9 +12,9 @@
- 
- 
- install-data-hook:
--	rm -Rf $(prefix)/doc/uds
--	mkdir -p $(prefix)/doc/uds
--	cp $(srcdir)/doc/*.html $(prefix)/doc/uds
-+	rm -Rf $(prefix)/share/doc/uds
-+	mkdir -p $(prefix)/share/doc/uds
-+	cp $(srcdir)/doc/*.html $(prefix)/share/doc/uds
- 
- uninstall-local:
- 	rm -Rf /usr/doc/uds
diff --git a/devel/uds/files/patch-configure.in b/devel/uds/files/patch-configure.in
deleted file mode 100644
index a44be528acf1..000000000000
--- a/devel/uds/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Mon Apr  2 20:09:38 2001
-+++ configure.in	Mon Apr  2 20:09:49 2001
-@@ -23,7 +23,7 @@
- AC_LANG_CPLUSPLUS
- 
- dnl Checks for libraries.
--AC_CHECK_LIB(pthread, main, thread_dir=thread, thread_dir=)
-+AC_CHECK_LIB(c_r, main, thread_dir=thread, thread_dir=)
- AC_SUBST(thread_dir)
- 
- dnl Checks for header files.
diff --git a/devel/uds/pkg-plist b/devel/uds/pkg-plist
index e9a1e892ac8a..a7a5cd1c0761 100644
--- a/devel/uds/pkg-plist
+++ b/devel/uds/pkg-plist
@@ -31,12 +31,15 @@ include/uds/uds.hh
 lib/libuds.a
 lib/libuds.so
 lib/libuds.so.0
-share/doc/uds/config.html
-share/doc/uds/contributing.html
-share/doc/uds/download.html
-share/doc/uds/features.html
-share/doc/uds/index.html
-share/doc/uds/relnotes.html
-@dirrm share/doc/uds
+lib/libudsthread.a
+lib/libudsthread.so
+lib/libudsthread.so.0
+%%PORTDOCS%%share/doc/uds/config.html
+%%PORTDOCS%%share/doc/uds/contributing.html
+%%PORTDOCS%%share/doc/uds/download.html
+%%PORTDOCS%%share/doc/uds/features.html
+%%PORTDOCS%%share/doc/uds/index.html
+%%PORTDOCS%%share/doc/uds/relnotes.html
+%%PORTDOCS%%@dirrm share/doc/uds
 share/uds/udsdeff.cc
 @dirrm share/uds