Updated to version 1.7.4.

PR:		46860
Submitted by:	phil@nixil.org (Phil Oleson)

6 files changed, 17 insertions, 39 deletions

diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile
index e3c349e48624..2a4390f2bcc7 100644
--- a/devel/ptypes/Makefile
+++ b/devel/ptypes/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ptypes
-PORTVERSION=	1.7.1
+PORTVERSION=	1.7.4
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-CFLAGS+=	${PTHREAD_CFLAGS} -fPIC
+CFLAGS+=	${PTHREAD_CFLAGS}
 SHLIB_VER=	1
 INSTALLS_SHLIB=	yes
 MAKE_ARGS+=	SHLIB_VER=${SHLIB_VER} CFLAGS="${CFLAGS}" \
diff --git a/devel/ptypes/distinfo b/devel/ptypes/distinfo
index c7a8bcae6b51..a69d4661fef7 100644
--- a/devel/ptypes/distinfo
+++ b/devel/ptypes/distinfo
@@ -1 +1 @@
-MD5 (ptypes-1.7.1.tar.gz) = bd630ba1e72623ef2fca22952345e04f
+MD5 (ptypes-1.7.4.tar.gz) = b00b51fa1abc8ea46d662042c827019f
diff --git a/devel/ptypes/files/patch-src-Makefile.FreeBSD b/devel/ptypes/files/patch-src-Makefile.FreeBSD
index e37f6ab9b6c0..7833a1cdf614 100644
--- a/devel/ptypes/files/patch-src-Makefile.FreeBSD
+++ b/devel/ptypes/files/patch-src-Makefile.FreeBSD
@@ -1,14 +1,14 @@
---- src/Makefile.FreeBSD.orig	Fri Oct 18 09:01:34 2002
-+++ src/Makefile.FreeBSD	Tue Oct 22 07:33:42 2002
+--- src/Makefile.FreeBSD.orig	Wed Jan  8 03:14:56 2003
++++ src/Makefile.FreeBSD	Wed Jan  8 03:14:59 2003
 @@ -15,9 +15,9 @@
  
  CXX = g++
  
 -CXXOPTS = -pthread
-+CXXOPTS = 
++CXXOPTS =
  
--RANLIB = test
-+RANLIB = ranlib
+-LDLIBS = -lc_r
++LDLIBS =
  
  SOEXT = so
  
diff --git a/devel/ptypes/files/patch-src-Makefile.common b/devel/ptypes/files/patch-src-Makefile.common
index 3ae78cf4a1e0..856ccb1e6dc7 100644
--- a/devel/ptypes/files/patch-src-Makefile.common
+++ b/devel/ptypes/files/patch-src-Makefile.common
@@ -1,16 +1,16 @@
---- src/Makefile.common.orig	Fri Oct 18 09:01:34 2002
-+++ src/Makefile.common	Tue Oct 22 07:31:47 2002
-@@ -18,17 +18,17 @@
+--- src/Makefile.common.orig	Wed Jan  8 03:12:14 2003
++++ src/Makefile.common	Wed Jan  8 03:13:59 2003
+@@ -20,17 +20,17 @@
  
- AR		= ar
+ RANLIB		= ranlib
  
 -CXXDEFS         = -DDEBUG
-+CXXDEFS         = 
++CXXDEFS         =
  
  INCDIR		= ../include
  
--CXXFLAGS	= $(CXXOPTS) $(CXXDEFS) -I$(INCDIR) -Wall -O2
-+CXXFLAGS	= $(CXXOPTS) $(CXXDEFS) -I$(INCDIR) -Wall $(CFLAGS)
+-CXXFLAGS	= $(CXXOPTS) $(CXXDEFS) -I$(INCDIR) -fPIC -Wall -O2
++CXXFLAGS	= $(CXXOPTS) $(CXXDEFS) -I$(INCDIR) -fPIC -Wall $(CFLAGS)
  
  LIBNAME		= libptypes.a
  LIBDEST		= ../lib
@@ -21,7 +21,7 @@
  SOREALNAME	= $(SONAME).$(SOVER)
  SODEST		= ../so
  
-@@ -72,7 +72,7 @@
+@@ -74,7 +74,7 @@
  	cp $@ $(LIBDEST)/
  
  $(SOREALNAME): $(LIBOBJS)
@@ -30,7 +30,7 @@
  	rm -f $(SONAME) ; ln -s $@ $(SONAME)
  	cp $@ $(SODEST)/
  	cd $(SODEST) ; rm -f $(SONAME) ; ln -s $@ $(SONAME) ; $(SOSTRIP) $@
-@@ -184,7 +184,8 @@
+@@ -190,7 +190,8 @@
  ptypes_test.o: ptypes_test.cxx $(HALL)
  
  ptypes_test: ptypes_test.o $(LIBNAME)
diff --git a/devel/ptypes/files/patch-wshare-Makefile.FreeBSD b/devel/ptypes/files/patch-wshare-Makefile.FreeBSD
deleted file mode 100644
index 9a5b2123b994..000000000000
--- a/devel/ptypes/files/patch-wshare-Makefile.FreeBSD
+++ /dev/null
@@ -1,11 +0,0 @@
---- wshare/Makefile.FreeBSD.orig	Fri Oct 18 09:01:35 2002
-+++ wshare/Makefile.FreeBSD	Tue Oct 22 07:37:07 2002
-@@ -15,7 +15,7 @@
- 
- CXX = g++
- 
--CXXOPTS = -pthread
-+CXXOPTS =
- 
- include Makefile.common
- 
diff --git a/devel/ptypes/files/patch-wshare-Makefile.common b/devel/ptypes/files/patch-wshare-Makefile.common
index 83ac3df62e9d..9e76bb36de80 100644
--- a/devel/ptypes/files/patch-wshare-Makefile.common
+++ b/devel/ptypes/files/patch-wshare-Makefile.common
@@ -13,14 +13,3 @@
 +CXXFLAGS    = $(CXXOPTS) $(CXXDEFS) -I$(INCDIR) -Wall $(CFLAGS)
  
  BINDEST     = ../bin
- 
-@@ -36,7 +36,8 @@
- 
- 
- wshare: $(OBJS) ../lib/libptypes.a
--	$(CXX) $(CXXFLAGS) $(OBJS) $(LDLIBS) ../lib/libptypes.a -o $@
-+	$(CXX) $(CXXFLAGS) $(OBJS) $(LDLIBS) ../lib/libptypes.a -o $@ \
-+		${PTHREAD_LIBS} -lc_r
- 	cp $@ $(BINDEST)/
- 	strip $(BINDEST)/$@
-