From owner-svn-ports-head@freebsd.org Thu Jan 26 02:11:56 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2283ACC1538; Thu, 26 Jan 2017 02:11:56 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EAA878D7; Thu, 26 Jan 2017 02:11:55 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0Q2Bt5s035097; Thu, 26 Jan 2017 02:11:55 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0Q2BslH035095; Thu, 26 Jan 2017 02:11:54 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201701260211.v0Q2BslH035095@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Thu, 26 Jan 2017 02:11:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432464 - in head/www/dtse: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2017 02:11:56 -0000 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 (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 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);