5 files changed, 60 insertions, 48 deletions

diff --git a/converters/mimepp/Makefile b/converters/mimepp/Makefile
index 6e02c0e9c8aa..af699abd4d31 100644
--- a/converters/mimepp/Makefile
+++ b/converters/mimepp/Makefile
@@ -6,31 +6,27 @@
 #
 
 PORTNAME=		mimepp
-PORTVERSION=		1.0
+PORTVERSION=		1.2.4
 CATEGORIES=		converters
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	devel/lang/c++
+MASTER_SITES=		http://www.hunnysoft.com/mimepp/
 
 MAINTAINER=		ports@FreeBSD.org
 
-MAKEFILE=		makefile.unx
-ALL_TARGET=		lib
+MAKEFILE=		makefile-unix
+ALL_TARGET=		default
 
 do-install:
-	@ ${INSTALL_DATA} ${WRKSRC}/libmimepp.a ${PREFIX}/lib
-	@ ${MKDIR} ${PREFIX}/include/mimepp
-.for file in address.h addrlist.h binhex.h body.h bodypart.h boyermor.h config.h datetime.h debug.h disptype.h entity.h enum.h field.h fieldbdy.h group.h headers.h mailbox.h mboxlist.h mechansm.h mediatyp.h message.h mimepp.h msgcmp.h msgid.h nntp.h param.h pop.h protocol.h smtp.h string.h text.h token.h utility.h uuencode.h
-	@ ${INSTALL_DATA} ${WRKSRC}/mimepp/${file} ${PREFIX}/include/mimepp
-.endfor
-	@ ${MKDIR} ${PREFIX}/share/doc/mimepp
-.for file in CPYRIGHT LICENSE README Tutorial
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/mimepp
-.endfor
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/mimepp
-	@ ${MKDIR} ${PREFIX}/share/examples/mimepp
-	@ ${INSTALL_DATA} ${FILESDIR}/Makefile ${PREFIX}/share/examples/mimepp
-.for file in attach.cpp attach.h basicmsg.cpp basicmsg.h exampl01.cpp exampl01.txt exampl02.cpp exampl02.txt exampl03.cpp exampl03.txt exampl04.cpp exampl04.txt exampl05.cpp exampl05.txt multipar.cpp multipar.h
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/examples/mimepp
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/dev/*.a ${PREFIX}/lib
+	@${MKDIR} ${PREFIX}/include/mimepp
+	${INSTALL_DATA} ${WRKSRC}/src/mimepp/*.h ${PREFIX}/include/mimepp
+	@${MKDIR} ${PREFIX}/share/examples/mimepp
+	${INSTALL_DATA} ${WRKSRC}/examples/*.cpp ${PREFIX}/share/examples/mimepp
+	${INSTALL_DATA} ${WRKSRC}/examples/*.h ${PREFIX}/share/examples/mimepp
+	${INSTALL_DATA} ${WRKSRC}/examples/*.txt ${PREFIX}/share/examples/mimepp
+	${INSTALL_DATA} ${WRKSRC}/examples/makefile-unix ${PREFIX}/share/examples/mimepp
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/mimepp
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mimepp
+.endif
 
 .include <bsd.port.mk>
diff --git a/converters/mimepp/distinfo b/converters/mimepp/distinfo
index ae89690aeceb..0143947f56a1 100644
--- a/converters/mimepp/distinfo
+++ b/converters/mimepp/distinfo
@@ -1 +1 @@
-MD5 (mimepp-1.0.tar.gz) = c028be12cd77339e3277c30bef58fb4a
+MD5 (mimepp-1.2.4.tar.gz) = d5001792f1fb946162bc959b8f030d14
diff --git a/converters/mimepp/files/patch-aa b/converters/mimepp/files/patch-aa
index deec594ada2b..0a31fe3c96e0 100644
--- a/converters/mimepp/files/patch-aa
+++ b/converters/mimepp/files/patch-aa
@@ -1,19 +1,26 @@
-*** makefile.unx	Tue Sep  2 19:28:33 1997
---- /home/andy/tmp/wrk/makefile.unx	Tue Sep 23 07:48:55 1997
-***************
-*** 26,32 ****
-  # C++ compiler flags (except -c, -I, -L, -l)
-  #
-  # Add -g here if you want debugger symbols included
-! CXXFLAGS =
-  
-  # The search path for include files. Change only if necessary.
-  INC_PATH = -I.
---- 26,32 ----
-  # C++ compiler flags (except -c, -I, -L, -l)
-  #
-  # Add -g here if you want debugger symbols included
-! CXXFLAGS = ${CFLAGS}
-  
-  # The search path for include files. Change only if necessary.
-  INC_PATH = -I.
+--- makefile-unix.orig	Wed Sep  1 17:14:36 1999
++++ makefile-unix	Thu Mar 30 21:23:08 2000
+@@ -19,19 +19,19 @@
+ 
+ ###### Tools
+ 
+-CXX = g++
++CXX ?= g++
+ AR = ar
+ RANLIB = ranlib
+ 
+ ###### Compiler/linker flags
+ 
+-DBG_CXX_FLAGS = -DDW_DEBUG_VERSION -g -fexceptions -I./src
++DBG_CXX_FLAGS = -DDW_DEBUG_VERSION ${CXXFLAGS} -I./src
+ DBG_LINK_FLAGS = 
+ 
+-DEV_CXX_FLAGS = -DDW_DEVELOPMENT_VERSION -g -fexceptions -I./src
++DEV_CXX_FLAGS = -DDW_DEVELOPMENT_VERSION ${CXXFLAGS} -I./src
+ DEV_LINK_FLAGS = 
+ 
+-REL_CXX_FLAGS = -DDW_PRODUCTION_VERSION -fexceptions -I./src
++REL_CXX_FLAGS = -DDW_PRODUCTION_VERSION ${CXXFLAGS} -I./src
+ REL_LINK_FLAGS = 
+ 
+ ###### Default target
diff --git a/converters/mimepp/pkg-descr b/converters/mimepp/pkg-descr
index 00e2b3aff637..48c6ea644d44 100644
--- a/converters/mimepp/pkg-descr
+++ b/converters/mimepp/pkg-descr
@@ -6,3 +6,5 @@ who are familiar with the MIME standard.  MIME++ supports
 quoted-printable and base64 encoding/decoding, and all
 header fields specified in RFC-822, RFC-1036, and RFC-2045.
 MIME++ is extensible through inheritance and polymorphism.
+
+WWW: http://www.hunnysoft.com/mimepp/
diff --git a/converters/mimepp/pkg-plist b/converters/mimepp/pkg-plist
index 2b0234db01b2..7487ce3533c1 100644
--- a/converters/mimepp/pkg-plist
+++ b/converters/mimepp/pkg-plist
@@ -1,8 +1,10 @@
 include/mimepp/address.h
 include/mimepp/addrlist.h
+include/mimepp/applfile.h
 include/mimepp/binhex.h
 include/mimepp/body.h
 include/mimepp/bodypart.h
+include/mimepp/bounds.h
 include/mimepp/boyermor.h
 include/mimepp/config.h
 include/mimepp/datetime.h
@@ -10,6 +12,7 @@ include/mimepp/debug.h
 include/mimepp/disptype.h
 include/mimepp/entity.h
 include/mimepp/enum.h
+include/mimepp/except.h
 include/mimepp/field.h
 include/mimepp/fieldbdy.h
 include/mimepp/group.h
@@ -25,20 +28,23 @@ include/mimepp/msgid.h
 include/mimepp/nntp.h
 include/mimepp/param.h
 include/mimepp/pop.h
+include/mimepp/proto_nt.h
+include/mimepp/proto_un.h
 include/mimepp/protocol.h
 include/mimepp/smtp.h
+include/mimepp/stamp.h
 include/mimepp/string.h
+include/mimepp/system.h
 include/mimepp/text.h
 include/mimepp/token.h
 include/mimepp/utility.h
 include/mimepp/uuencode.h
-lib/libmimepp.a
-share/doc/mimepp/CPYRIGHT
-share/doc/mimepp/LICENSE
-share/doc/mimepp/README
-share/doc/mimepp/Tutorial
+lib/libmimepp_core.a
+lib/libmimepp_net.a
+lib/libmimepp_util.a
 share/doc/mimepp/address.html
 share/doc/mimepp/addrlist.html
+share/doc/mimepp/applfile.html
 share/doc/mimepp/binhex.html
 share/doc/mimepp/body.html
 share/doc/mimepp/bodypart.html
@@ -63,11 +69,11 @@ share/doc/mimepp/param.html
 share/doc/mimepp/pop.html
 share/doc/mimepp/protocol.html
 share/doc/mimepp/smtp.html
+share/doc/mimepp/stamp.html
 share/doc/mimepp/string.html
 share/doc/mimepp/text.html
 share/doc/mimepp/util.html
 share/doc/mimepp/uuencode.html
-share/examples/mimepp/Makefile
 share/examples/mimepp/attach.cpp
 share/examples/mimepp/attach.h
 share/examples/mimepp/basicmsg.cpp
@@ -82,8 +88,9 @@ share/examples/mimepp/exampl04.cpp
 share/examples/mimepp/exampl04.txt
 share/examples/mimepp/exampl05.cpp
 share/examples/mimepp/exampl05.txt
+share/examples/mimepp/makefile-unix
 share/examples/mimepp/multipar.cpp
 share/examples/mimepp/multipar.h
-@dirrm include/mimepp
-@dirrm share/doc/mimepp
 @dirrm share/examples/mimepp
+@dirrm share/doc/mimepp
+@dirrm include/mimepp