From 2ddcd2421bbb0cdce167714b44a6e3a249d41f01 Mon Sep 17 00:00:00 2001
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Fri, 28 May 2004 11:51:54 +0000
Subject: [PATCH] Update to version 0.26.3.  Merge some changes from the
 following PR.

PR:		66645
Submitted by:	Thierry Thomas <thierry@pompo.net>
---
 devel/rudiments/Makefile                 |  9 +++++---
 devel/rudiments/distinfo                 |  4 ++--
 devel/rudiments/files/patch-config.mk.in | 11 ----------
 devel/rudiments/files/patch-configure    | 26 +++++++++++++++++++++---
 devel/rudiments/pkg-plist                |  1 +
 5 files changed, 32 insertions(+), 19 deletions(-)
 delete mode 100644 devel/rudiments/files/patch-config.mk.in

diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index 5c03bdcdd635..9b33e39ff47a 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rudiments
-PORTVERSION=	0.26
+PORTVERSION=	0.26.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,8 +14,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility C++ class library for daemons, clients, servers and more
 
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=		PTHREADINCLUDES="${PTHREAD_CFLAGS}" \
+			PTHREADLIB="${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rudiments/distinfo b/devel/rudiments/distinfo
index d349a51be4c8..e67fc5802406 100644
--- a/devel/rudiments/distinfo
+++ b/devel/rudiments/distinfo
@@ -1,2 +1,2 @@
-MD5 (rudiments-0.26.tar.gz) = 73be0511f3917740ec825dd49e8d2760
-SIZE (rudiments-0.26.tar.gz) = 358442
+MD5 (rudiments-0.26.3.tar.gz) = c0244258820bd1df788f0a522daca46e
+SIZE (rudiments-0.26.3.tar.gz) = 453224
diff --git a/devel/rudiments/files/patch-config.mk.in b/devel/rudiments/files/patch-config.mk.in
deleted file mode 100644
index cb0154c3bad8..000000000000
--- a/devel/rudiments/files/patch-config.mk.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.mk.in.orig	Tue Nov 25 08:04:00 2003
-+++ config.mk.in	Wed May 26 12:48:10 2004
-@@ -9,7 +9,7 @@
- bindir = @bindir@
- incdir = @includedir@
- libdir = @libdir@
--docdir = $(prefix)/doc/rudiments
-+docdir = $(prefix)/share/doc/rudiments
- 
- # compiler to use
- CXX = @CXX@
diff --git a/devel/rudiments/files/patch-configure b/devel/rudiments/files/patch-configure
index e9e837fcfa07..c4725d23bb45 100644
--- a/devel/rudiments/files/patch-configure
+++ b/devel/rudiments/files/patch-configure
@@ -1,6 +1,26 @@
---- configure.orig	Sat Nov 29 22:39:23 2003
-+++ configure	Wed May 26 15:31:52 2004
-@@ -13768,7 +13768,7 @@
+--- configure.orig	Tue Dec 30 20:12:47 2003
++++ configure	Fri May 28 15:32:46 2004
+@@ -1505,7 +1505,7 @@
+   enableval="$enable_debug"
+   CXXFLAGS="-g -pg -fno-exceptions -Wall"; INSTALLSTRIP=""
+ else
+-  CXXFLAGS="-fomit-frame-pointer -fno-exceptions -Wall"; INSTALLSTRIP="-s"
++  CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer -fno-exceptions -Wall"; INSTALLSTRIP="-s"
+ fi;
+ 
+ # Check whether --with-system-libtool or --without-system-libtool was given.
+@@ -19444,8 +19444,8 @@
+ 
+ 
+ HAVE_PTHREAD=""
+-PTHREADINCLUDES=""
+-PTHREADLIB=""
++#PTHREADINCLUDES=""
++#PTHREADLIB=""
+ 
+ if ( test "$cross_compiling" = "yes" )
+ then
+@@ -25251,7 +25251,7 @@
  #define RUDIMENTS_VERSION "$RUDIMENTS_VERSION"
  _ACEOF
  
diff --git a/devel/rudiments/pkg-plist b/devel/rudiments/pkg-plist
index 11695ad4c4e1..4bdc3096b2be 100644
--- a/devel/rudiments/pkg-plist
+++ b/devel/rudiments/pkg-plist
@@ -141,6 +141,7 @@ include/rudiments/xmldom.h
 include/rudiments/xmldomnode.h
 include/rudiments/xmlsax.h
 lib/librudiments.a
+lib/librudiments.la
 lib/librudiments.so
 lib/librudiments.so.0
 share/doc/rudiments/classes/client.h.html