diff --git a/security/botan/Makefile b/security/botan/Makefile
index 86715c3aac3d..abd01e089850 100644
--- a/security/botan/Makefile
+++ b/security/botan/Makefile
@@ -7,25 +7,25 @@
 #
 
 PORTNAME=	opencl
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	OpenCL-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ijliao@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_NEWGCC=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.pl
-CONFIGURE_ARGS=	--nodebug gcc-freebsd-generic
+CONFIGURE_ARGS=	gcc-freebsd-generic
 
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	PORTVERSION=0.7.2
 
 .include <bsd.port.mk>
diff --git a/security/botan/distinfo b/security/botan/distinfo
index 1f421efff9d0..8c40a78f9f65 100644
--- a/security/botan/distinfo
+++ b/security/botan/distinfo
@@ -1 +1 @@
-MD5 (OpenCL-0.7.0.tgz) = 551e39f327ea2eb8b7ca3e1d470a0fea
+MD5 (OpenCL-0.7.3.tgz) = 19b67c399a21e61989d06e9d27645fc8
diff --git a/security/botan/files/patch-Makefile b/security/botan/files/patch-Makefile
deleted file mode 100644
index e81dbb699ced..000000000000
--- a/security/botan/files/patch-Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
---- Makefile.orig	Thu Mar  1 07:14:54 2001
-+++ Makefile	Sat Mar  3 02:51:20 2001
-@@ -23,7 +23,7 @@
- DOCDIR        = $(INSTALLROOT)/share/doc/$(NAME)-$(VERSION)
- 
- OWNER         = root
--GROUP         = root
-+GROUP         = wheel
- DATA_MODE     = 644
- EXEC_MODE     = 755
- 
-@@ -79,7 +79,7 @@
- SYMLINK1      = $(LIBNAME)-$(MAJOR).$(MINOR).so
- SYMLINK2      = $(LIBNAME)-$(MAJOR).so
- SYMLINK3      = $(LIBNAME).so
--SYMLINKS      = $(SYMLINK1) $(SYMLINK2) $(SYMLINK3)
-+SYMLINKS      = $(SYMLINK3)
- 
- LIBRARIES     = $(STATIC_LIB) $(SHARED_LIB)
- else
-@@ -105,9 +105,7 @@
- ifneq (,$(findstring yes,$(MAKE_SHARED)))
- $(SHARED_LIB): $(LIBOBJS)
- 	$(CXX) $(SO_LINK_FLAGS) $(LIBOBJS) -o $(SHARED_LIB)
--	$(call LN,.,$(SYMLINK0),$(SYMLINK1))
--	$(call LN,.,$(SYMLINK1),$(SYMLINK2))
--	$(call LN,.,$(SYMLINK2),$(SYMLINK3))
-+	$(call LN,.,$(SYMLINK0),$(SYMLINK3))
- endif
- 
- ##################################################
-@@ -154,9 +152,7 @@
- 	$(call INSTALL,$(DATA_MODE)) $(STATIC_LIB) $(LIBDIR)
- ifneq (,$(findstring yes,$(MAKE_SHARED)))
- 	$(call INSTALL,$(EXEC_MODE)) $(SHARED_LIB) $(LIBDIR)
--	$(call LN,$(LIBDIR),$(SYMLINK0),$(SYMLINK1))
--	$(call LN,$(LIBDIR),$(SYMLINK1),$(SYMLINK2))
--	$(call LN,$(LIBDIR),$(SYMLINK2),$(SYMLINK3))
-+	$(call LN,$(LIBDIR),$(SYMLINK0),$(SYMLINK3))
- endif
- 
- install_user: $(LIBRARIES)
-@@ -165,9 +161,7 @@
- 	$(call INSTALL,$(DATA_MODE)) $(USER_DOCS) $(DOCDIR)
- ifneq (,$(findstring yes,$(MAKE_SHARED)))
- 	$(call INSTALL,$(EXEC_MODE)) $(SHARED_LIB) $(LIBDIR)
--	$(call LN,$(LIBDIR),$(SYMLINK0),$(SYMLINK1))
--	$(call LN,$(LIBDIR),$(SYMLINK1),$(SYMLINK2))
--	$(call LN,$(LIBDIR),$(SYMLINK2),$(SYMLINK3))
-+	$(call LN,$(LIBDIR),$(SYMLINK0),$(SYMLINK3))
- endif
- 
- install_devel: $(LIBRARIES)
diff --git a/security/botan/files/patch-configure.pl b/security/botan/files/patch-configure.pl
new file mode 100644
index 000000000000..7ce69a825bc2
--- /dev/null
+++ b/security/botan/files/patch-configure.pl
@@ -0,0 +1,20 @@
+--- configure.pl.orig	Sat Jun  9 09:40:22 2001
++++ configure.pl	Sun Jun 10 19:23:51 2001
+@@ -1312,7 +1312,7 @@
+ DOCDIR        = \$(INSTALLROOT)/share/doc/\$(NAME)-\$(VERSION)
+ 
+ OWNER         = root
+-GROUP         = root
++GROUP         = wheel
+ DATA_MODE     = 644
+ EXEC_MODE     = 755
+ 
+@@ -1341,7 +1341,7 @@
+ # FIXME: Hardcoded
+ USER_DOCS     = readme.txt doc/license.txt doc/log.txt doc/thanks.txt \\
+                 doc/pgpkeys.asc
+-DEVEL_DOCS    = doc/doc.ps doc/relnotes.txt
++DEVEL_DOCS    = doc/opencl.ps doc/relnotes.txt
+ 
+ HEADERS       = $headers
+ 
diff --git a/security/botan/pkg-plist b/security/botan/pkg-plist
index 9d0add8eb7bc..5a9a246fb7d0 100644
--- a/security/botan/pkg-plist
+++ b/security/botan/pkg-plist
@@ -6,6 +6,7 @@ include/opencl/checksum.h
 include/opencl/config.h
 include/opencl/cscipher.h
 include/opencl/des.h
+include/opencl/desx.h
 include/opencl/emac.h
 include/opencl/encoder.h
 include/opencl/exceptn.h
@@ -53,19 +54,20 @@ include/opencl/triple.h
 include/opencl/twofish.h
 include/opencl/types.h
 include/opencl/util.h
+include/opencl/version.h
 include/opencl/x917.h
 include/opencl/xtea.h
 @dirrm include/opencl
 lib/libopencl.a
 lib/libopencl-%%PORTVERSION%%.so
+lib/libopencl-0.7.so
+lib/libopencl-0.so
 lib/libopencl.so
-share/doc/OpenCL-%%PORTVERSION%%/OpenCL.spec
 share/doc/OpenCL-%%PORTVERSION%%/license.txt
-share/doc/OpenCL-%%PORTVERSION%%/opencl.asc
+share/doc/OpenCL-%%PORTVERSION%%/log.txt
 share/doc/OpenCL-%%PORTVERSION%%/opencl.ps
-share/doc/OpenCL-%%PORTVERSION%%/opencl.tex
+share/doc/OpenCL-%%PORTVERSION%%/pgpkeys.asc
 share/doc/OpenCL-%%PORTVERSION%%/readme.txt
 share/doc/OpenCL-%%PORTVERSION%%/relnotes.txt
 share/doc/OpenCL-%%PORTVERSION%%/thanks.txt
-share/doc/OpenCL-%%PORTVERSION%%/todo.txt
 @dirrm share/doc/OpenCL-%%PORTVERSION%%
diff --git a/security/opencl/Makefile b/security/opencl/Makefile
index 86715c3aac3d..abd01e089850 100644
--- a/security/opencl/Makefile
+++ b/security/opencl/Makefile
@@ -7,25 +7,25 @@
 #
 
 PORTNAME=	opencl
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	OpenCL-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ijliao@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_NEWGCC=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.pl
-CONFIGURE_ARGS=	--nodebug gcc-freebsd-generic
+CONFIGURE_ARGS=	gcc-freebsd-generic
 
 USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	PORTVERSION=0.7.2
 
 .include <bsd.port.mk>
diff --git a/security/opencl/distinfo b/security/opencl/distinfo
index 1f421efff9d0..8c40a78f9f65 100644
--- a/security/opencl/distinfo
+++ b/security/opencl/distinfo
@@ -1 +1 @@
-MD5 (OpenCL-0.7.0.tgz) = 551e39f327ea2eb8b7ca3e1d470a0fea
+MD5 (OpenCL-0.7.3.tgz) = 19b67c399a21e61989d06e9d27645fc8
diff --git a/security/opencl/files/patch-Makefile b/security/opencl/files/patch-Makefile
deleted file mode 100644
index e81dbb699ced..000000000000
--- a/security/opencl/files/patch-Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
---- Makefile.orig	Thu Mar  1 07:14:54 2001
-+++ Makefile	Sat Mar  3 02:51:20 2001
-@@ -23,7 +23,7 @@
- DOCDIR        = $(INSTALLROOT)/share/doc/$(NAME)-$(VERSION)
- 
- OWNER         = root
--GROUP         = root
-+GROUP         = wheel
- DATA_MODE     = 644
- EXEC_MODE     = 755
- 
-@@ -79,7 +79,7 @@
- SYMLINK1      = $(LIBNAME)-$(MAJOR).$(MINOR).so
- SYMLINK2      = $(LIBNAME)-$(MAJOR).so
- SYMLINK3      = $(LIBNAME).so
--SYMLINKS      = $(SYMLINK1) $(SYMLINK2) $(SYMLINK3)
-+SYMLINKS      = $(SYMLINK3)
- 
- LIBRARIES     = $(STATIC_LIB) $(SHARED_LIB)
- else
-@@ -105,9 +105,7 @@
- ifneq (,$(findstring yes,$(MAKE_SHARED)))
- $(SHARED_LIB): $(LIBOBJS)
- 	$(CXX) $(SO_LINK_FLAGS) $(LIBOBJS) -o $(SHARED_LIB)
--	$(call LN,.,$(SYMLINK0),$(SYMLINK1))
--	$(call LN,.,$(SYMLINK1),$(SYMLINK2))
--	$(call LN,.,$(SYMLINK2),$(SYMLINK3))
-+	$(call LN,.,$(SYMLINK0),$(SYMLINK3))
- endif
- 
- ##################################################
-@@ -154,9 +152,7 @@
- 	$(call INSTALL,$(DATA_MODE)) $(STATIC_LIB) $(LIBDIR)
- ifneq (,$(findstring yes,$(MAKE_SHARED)))
- 	$(call INSTALL,$(EXEC_MODE)) $(SHARED_LIB) $(LIBDIR)
--	$(call LN,$(LIBDIR),$(SYMLINK0),$(SYMLINK1))
--	$(call LN,$(LIBDIR),$(SYMLINK1),$(SYMLINK2))
--	$(call LN,$(LIBDIR),$(SYMLINK2),$(SYMLINK3))
-+	$(call LN,$(LIBDIR),$(SYMLINK0),$(SYMLINK3))
- endif
- 
- install_user: $(LIBRARIES)
-@@ -165,9 +161,7 @@
- 	$(call INSTALL,$(DATA_MODE)) $(USER_DOCS) $(DOCDIR)
- ifneq (,$(findstring yes,$(MAKE_SHARED)))
- 	$(call INSTALL,$(EXEC_MODE)) $(SHARED_LIB) $(LIBDIR)
--	$(call LN,$(LIBDIR),$(SYMLINK0),$(SYMLINK1))
--	$(call LN,$(LIBDIR),$(SYMLINK1),$(SYMLINK2))
--	$(call LN,$(LIBDIR),$(SYMLINK2),$(SYMLINK3))
-+	$(call LN,$(LIBDIR),$(SYMLINK0),$(SYMLINK3))
- endif
- 
- install_devel: $(LIBRARIES)
diff --git a/security/opencl/files/patch-configure.pl b/security/opencl/files/patch-configure.pl
new file mode 100644
index 000000000000..7ce69a825bc2
--- /dev/null
+++ b/security/opencl/files/patch-configure.pl
@@ -0,0 +1,20 @@
+--- configure.pl.orig	Sat Jun  9 09:40:22 2001
++++ configure.pl	Sun Jun 10 19:23:51 2001
+@@ -1312,7 +1312,7 @@
+ DOCDIR        = \$(INSTALLROOT)/share/doc/\$(NAME)-\$(VERSION)
+ 
+ OWNER         = root
+-GROUP         = root
++GROUP         = wheel
+ DATA_MODE     = 644
+ EXEC_MODE     = 755
+ 
+@@ -1341,7 +1341,7 @@
+ # FIXME: Hardcoded
+ USER_DOCS     = readme.txt doc/license.txt doc/log.txt doc/thanks.txt \\
+                 doc/pgpkeys.asc
+-DEVEL_DOCS    = doc/doc.ps doc/relnotes.txt
++DEVEL_DOCS    = doc/opencl.ps doc/relnotes.txt
+ 
+ HEADERS       = $headers
+ 
diff --git a/security/opencl/pkg-plist b/security/opencl/pkg-plist
index 9d0add8eb7bc..5a9a246fb7d0 100644
--- a/security/opencl/pkg-plist
+++ b/security/opencl/pkg-plist
@@ -6,6 +6,7 @@ include/opencl/checksum.h
 include/opencl/config.h
 include/opencl/cscipher.h
 include/opencl/des.h
+include/opencl/desx.h
 include/opencl/emac.h
 include/opencl/encoder.h
 include/opencl/exceptn.h
@@ -53,19 +54,20 @@ include/opencl/triple.h
 include/opencl/twofish.h
 include/opencl/types.h
 include/opencl/util.h
+include/opencl/version.h
 include/opencl/x917.h
 include/opencl/xtea.h
 @dirrm include/opencl
 lib/libopencl.a
 lib/libopencl-%%PORTVERSION%%.so
+lib/libopencl-0.7.so
+lib/libopencl-0.so
 lib/libopencl.so
-share/doc/OpenCL-%%PORTVERSION%%/OpenCL.spec
 share/doc/OpenCL-%%PORTVERSION%%/license.txt
-share/doc/OpenCL-%%PORTVERSION%%/opencl.asc
+share/doc/OpenCL-%%PORTVERSION%%/log.txt
 share/doc/OpenCL-%%PORTVERSION%%/opencl.ps
-share/doc/OpenCL-%%PORTVERSION%%/opencl.tex
+share/doc/OpenCL-%%PORTVERSION%%/pgpkeys.asc
 share/doc/OpenCL-%%PORTVERSION%%/readme.txt
 share/doc/OpenCL-%%PORTVERSION%%/relnotes.txt
 share/doc/OpenCL-%%PORTVERSION%%/thanks.txt
-share/doc/OpenCL-%%PORTVERSION%%/todo.txt
 @dirrm share/doc/OpenCL-%%PORTVERSION%%