Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Jan 2017 02:11:54 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432464 - in head/www/dtse: . files
Message-ID:  <201701260211.v0Q2BslH035095@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhale
Date: Thu Jan 26 02:11:54 2017
New Revision: 432464
URL: https://svnweb.freebsd.org/changeset/ports/432464

Log:
  Update MASTER_SITES
  
  While here:
  Fix LICENSE and add LICENSE_FILE
  Convert USE_AUTOTOOLS to USES=autoreconf
  Convert USE_OPENSSL to USES=ssl
  Convert to options helpers
  
  PR:		216394
  Submitted by:	Douglas Thrift <douglas@douglasthrift.net> (maintainer)

Deleted:
  head/www/dtse/files/patch-autogen.sh
Modified:
  head/www/dtse/Makefile
  head/www/dtse/files/patch-configure.ac

Modified: head/www/dtse/Makefile
==============================================================================
--- head/www/dtse/Makefile	Thu Jan 26 00:19:17 2017	(r432463)
+++ head/www/dtse/Makefile	Thu Jan 26 02:11:54 2017	(r432464)
@@ -3,39 +3,36 @@
 
 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>

Modified: head/www/dtse/files/patch-configure.ac
==============================================================================
--- head/www/dtse/files/patch-configure.ac	Thu Jan 26 00:19:17 2017	(r432463)
+++ head/www/dtse/files/patch-configure.ac	Thu Jan 26 02:11:54 2017	(r432464)
@@ -1,6 +1,6 @@
---- ./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
  
@@ -11,7 +11,6 @@
 +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
@@ -46,7 +45,7 @@
  ], [
  	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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701260211.v0Q2BslH035095>