Index: head/www/dtse/Makefile
===================================================================
--- head/www/dtse/Makefile	(revision 432463)
+++ head/www/dtse/Makefile	(revision 432464)
@@ -1,41 +1,38 @@
 # Created by: Douglas Thrift <douglas@douglasthrift.net>
 # $FreeBSD$
 
 PORTNAME=	dtse
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
-MASTER_SITES=	http://apt.douglasthrift.net/files/${PORTNAME}/ \
-		http://code.douglasthrift.net/files/${PORTNAME}/
+MASTER_SITES=	http://dl1.douglasthrift.net/${PORTNAME}/ \
+		http://dl2.douglasthrift.net/${PORTNAME}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Indexing search engine for use on small websites
 
-LICENSE=	APACHE20
+LICENSE=	APACHE11
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_gnu_make.m4:devel/autoconf-archive
 
-.if defined(WITH_OPENSSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
-.endif
-
-USES=		gmake perl5 shebangfix tar:bzip2
+USES=		autoreconf gmake perl5 shebangfix tar:bzip2
 SHEBANG_FILES=	search.cgi.in
 perl_OLD_CMD=	@which_perl@
-USE_AUTOTOOLS=	aclocal:env automake:env autoconf:env
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX}/${PORTNAME}
+GNU_CONFIGURE=	yes
+GNU_CONFIGURE_PREFIX=	${PREFIX}/${PORTNAME}
 
 MAKEFILE=	GNUmakefile
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes
 
-pre-configure:
-	cd ${WRKSRC}; ${SH} autogen.sh
+OPTIONS_DEFINE=		OPENSSL
+
+OPENSSL_USES=		ssl
+OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 
 .include <bsd.port.mk>
Index: head/www/dtse/files/patch-autogen.sh
===================================================================
--- head/www/dtse/files/patch-autogen.sh	(revision 432463)
+++ head/www/dtse/files/patch-autogen.sh	(nonexistent)
@@ -1,17 +0,0 @@
---- ./autogen.sh.orig	2011-12-30 17:37:16.000000000 -0800
-+++ ./autogen.sh	2011-12-30 17:37:16.000000000 -0800
-@@ -0,0 +1,14 @@
-+#!/bin/sh
-+#
-+# Douglas Thrift's Search Engine
-+#
-+# Douglas Thrift
-+#
-+# $Id$
-+
-+set -e
-+cd `dirname $0`
-+
-+aclocal
-+automake -acf || true
-+autoconf

Property changes on: head/www/dtse/files/patch-autogen.sh
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/www/dtse/files/patch-configure.ac
===================================================================
--- head/www/dtse/files/patch-configure.ac	(revision 432463)
+++ head/www/dtse/files/patch-configure.ac	(revision 432464)
@@ -1,57 +1,56 @@
---- ./configure.ac.orig	2008-08-23 03:29:42.000000000 -0700
-+++ ./configure.ac	2011-12-30 17:37:16.000000000 -0800
-@@ -9,36 +9,22 @@
+--- configure.ac.orig	2008-08-23 10:29:42 UTC
++++ configure.ac
+@@ -9,36 +9,21 @@ AC_CONFIG_SRCDIR(Search.cpp)
  AC_PREFIX_DEFAULT(/usr/local/dtse)
  AC_PROG_INSTALL
  
 -CHECK_GNU_MAKE
 -if test x$_cv_gnu_make_command = x; then
 -    AC_MSG_ERROR(You need GNU Make.)
 -fi
 +AX_CHECK_GNU_MAKE
 +AC_SUBST([GNUMAKE], [$_cv_gnu_make_command])
 +AS_IF([test "x$GNUMAKE" = x], [AC_MSG_ERROR([You need GNU make])])
-+AX_WITH_PERL
 +AX_PROG_PERL_MODULES([File::Temp], [], [AC_MSG_ERROR([You need File::Temp.])])
 +AC_LANG([C++])
  AC_PROG_CXX
 -if ! test x$GXX = x; then
 -	AC_MSG_CHECKING(if g++ is version 3.1 or higher)
 -	dt_gxx_3_x=`$CXX --version 2>&1 | grep ^$CXX`
 -	if test "x$dt_gxx_3_x" = "x"; then
 -		AC_MSG_RESULT(no)
 -		AC_MSG_ERROR(You need g++ 3.1 or higher.)
 -	else
 -		AC_MSG_RESULT(yes)
 -	fi
 -fi
 -AC_PROG_PERL_VERSION(5.00503, , AC_MSG_ERROR(You need a Perl 5.6 or higher.))
 -AC_MSG_CHECKING(perl path)
 -AC_SUBST(which_perl, `which $PERL`)
 -AC_MSG_RESULT($which_perl)
 -
 -AC_PROG_PERL_MODULES(File::Temp, , AC_MSG_ERROR(You need File::Temp.))
  mingw=`$CXX --version 2>&1 | grep mingw\ special`
  if test "x$mingw" = "x"; then
 -	ETR_SOCKET_NSL
 +	AX_LIB_SOCKET_NSL
  	LIBS="$LIBS $ETR_SOCKET_LIBS"
  else
  	LIBS="$LIBS -lws2_32"
  fi
 -AC_MSG_CHECKING(if OpenSSL is wanted)
 -AC_ARG_WITH(openssl, [[  --with-openssl[=DIR]    enable OpenSSL [DIR=path]]
 +AC_MSG_CHECKING([if OpenSSL is wanted])
 +AC_ARG_WITH([openssl], [[  --with-openssl[=DIR]    enable OpenSSL [DIR=path]]
  ], [
  	AC_MSG_RESULT(yes)
  	AC_MSG_CHECKING(for OpenSSL)
-@@ -62,7 +48,7 @@
+@@ -62,7 +47,7 @@ AC_ARG_WITH(openssl, [[  --with-openssl[
  		AC_SUBST(OpenSSL, -D_OpenSSL_)
  	else
  		AC_MSG_RESULT(not found);
 -		AC_MSG_ERROR(couldn't find OpenSSL)
 +		AC_MSG_ERROR(could not find OpenSSL)
  	fi
  ], [ AC_MSG_RESULT(no) ])
  if ! test x$openssl = x; then