From owner-svn-ports-head@freebsd.org Mon Dec 18 10:56:58 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 71DC9E836B9; Mon, 18 Dec 2017 10:56:58 +0000 (UTC) (envelope-from amdmi3@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 492F774BF4; Mon, 18 Dec 2017 10:56:58 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBIAuvxZ045971; Mon, 18 Dec 2017 10:56:57 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBIAuvNE045966; Mon, 18 Dec 2017 10:56:57 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201712181056.vBIAuvNE045966@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 18 Dec 2017 10:56:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456612 - in head/graphics/cthumb: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/graphics/cthumb: . files X-SVN-Commit-Revision: 456612 X-SVN-Commit-Repository: ports 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.25 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: Mon, 18 Dec 2017 10:56:58 -0000 Author: amdmi3 Date: Mon Dec 18 10:56:56 2017 New Revision: 456612 URL: https://svnweb.freebsd.org/changeset/ports/456612 Log: - Add LICENSE - Add NO_ARCH - Simplify installation - Switch to options helpers - makeparch Modified: head/graphics/cthumb/Makefile head/graphics/cthumb/files/patch-Makefile.in head/graphics/cthumb/files/patch-configure.in head/graphics/cthumb/files/patch-cthumb.in Modified: head/graphics/cthumb/Makefile ============================================================================== --- head/graphics/cthumb/Makefile Mon Dec 18 10:54:39 2017 (r456611) +++ head/graphics/cthumb/Makefile Mon Dec 18 10:56:56 2017 (r456612) @@ -10,6 +10,8 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Themeable web picture album generator +LICENSE= GPLv2+ + RUN_DEPENDS= ${LOCALBASE}/bin/pnmscale:graphics/netpbm \ ${LOCALBASE}/bin/jhead:graphics/jhead \ p5-HTML-Parser>=0:www/p5-HTML-Parser \ @@ -19,44 +21,18 @@ USES= jpeg:run perl5 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-themedir=${DATADIR} CONFIGURE_ENV= perl_path=${PERL} +NO_ARCH= yes -PORTDOCS= ChangeLog INSTALL README TO-DO VERSION cthumbrc.sample +PORTDOCS= BUGS ChangeLog README TO-DO cthumbrc.sample -THEMES= blue-steel.theme \ - classic-clips.theme \ - classic.theme \ - crosshair.theme \ - film.theme \ - flaps.theme \ - float-medium.theme \ - float-more.theme \ - float-thick.theme \ - float.theme \ - ithumb.theme \ - neat-round.theme \ - neat-square.theme \ - oak.theme \ - postcard.theme \ - shiny-tube.theme \ - simpleframe.theme \ - slides-big.theme \ - slides-clean.theme \ - slides-huge.theme \ - slides-small.theme \ - spotlight.theme \ - tv-large.theme \ - tv.theme - OPTIONS_DEFINE= DOCS do-install: ${INSTALL_SCRIPT} ${WRKSRC}/cthumb ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/cthumb.1 ${STAGEDIR}${PREFIX}/man/man1 - @${MKDIR} ${STAGEDIR}${DATADIR} -.for theme in ${THEMES} - @${MKDIR} ${STAGEDIR}${DATADIR}/${theme} - ${INSTALL_DATA} ${WRKSRC}/themes/${theme}/* ${STAGEDIR}${DATADIR}/${theme} -.endfor + ${INSTALL_MAN} ${WRKSRC}/cthumb.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + @cd ${WRKSRC}/themes && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} Modified: head/graphics/cthumb/files/patch-Makefile.in ============================================================================== --- head/graphics/cthumb/files/patch-Makefile.in Mon Dec 18 10:54:39 2017 (r456611) +++ head/graphics/cthumb/files/patch-Makefile.in Mon Dec 18 10:56:56 2017 (r456612) @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sat Feb 14 17:17:57 2004 -+++ Makefile.in Sat Feb 14 17:19:04 2004 -@@ -13,25 +13,13 @@ +--- Makefile.in.orig 2002-08-13 17:24:05 UTC ++++ Makefile.in +@@ -13,13 +13,7 @@ bindir=@bindir@ mandir=@mandir@ themedir=@themedir@ @@ -15,15 +15,16 @@ install: cthumb install -d $(bindir) $(prefix)/share $(themedir) $(mandir)/man1 - install -m555 cthumb $(bindir) +@@ -27,12 +21,6 @@ install: cthumb install cthumb.1 $(mandir)/man1 $(CPR) themes/* $(themedir) -- + -Makefile: Makefile.in VERSION configure - ./configure --prefix=/usr - -cthumb: cthumb.in VERSION configure - ./configure --prefix=/usr - +- dist: cthumb.spec cthumb # make prefix=$(shell pwd)/$(DD) install + install -d $(DD) Modified: head/graphics/cthumb/files/patch-configure.in ============================================================================== --- head/graphics/cthumb/files/patch-configure.in Mon Dec 18 10:54:39 2017 (r456611) +++ head/graphics/cthumb/files/patch-configure.in Mon Dec 18 10:56:56 2017 (r456612) @@ -1,6 +1,6 @@ ---- configure.in.orig Tue Aug 13 21:24:05 2002 -+++ configure.in Tue Jan 27 18:41:42 2004 -@@ -8,7 +8,7 @@ +--- configure.in.orig 2002-08-13 17:24:05 UTC ++++ configure.in +@@ -8,7 +8,7 @@ AC_CANONICAL_HOST dnl Checks for programs. AC_PATH_PROGS(perl_path, perl5 perl, no) AC_PROG_INSTALL Modified: head/graphics/cthumb/files/patch-cthumb.in ============================================================================== --- head/graphics/cthumb/files/patch-cthumb.in Mon Dec 18 10:54:39 2017 (r456611) +++ head/graphics/cthumb/files/patch-cthumb.in Mon Dec 18 10:56:56 2017 (r456612) @@ -1,6 +1,6 @@ ---- cthumb.in.orig Tue Aug 13 21:24:05 2002 -+++ cthumb.in Tue Jan 27 15:56:20 2004 -@@ -476,6 +476,7 @@ +--- cthumb.in.orig 2002-08-13 17:24:05 UTC ++++ cthumb.in +@@ -476,6 +476,7 @@ sub initial_checks { if ($CheckThumbnails) { eval "require Image::Size"; if (defined $Image::Size::VERSION) { @@ -8,7 +8,7 @@ $HaveImageSizePerlModule=1; } } -@@ -579,7 +580,10 @@ +@@ -579,7 +580,10 @@ sub do_file { if ($NoMainIndex) { unlink($indextmp); } else {