From owner-svn-ports-head@FreeBSD.ORG Fri Feb 14 11:25:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ECADED39; Fri, 14 Feb 2014 11:25:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D69D81C67; Fri, 14 Feb 2014 11:25:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EBPdJ7098984; Fri, 14 Feb 2014 11:25:39 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EBPde2098980; Fri, 14 Feb 2014 11:25:39 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201402141125.s1EBPde2098980@svn.freebsd.org> From: Pietro Cerutti Date: Fri, 14 Feb 2014 11:25:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344192 - in head/www/igal2: . 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.17 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: Fri, 14 Feb 2014 11:25:40 -0000 Author: gahr Date: Fri Feb 14 11:25:38 2014 New Revision: 344192 URL: http://svnweb.freebsd.org/changeset/ports/344192 QAT: https://qat.redports.org/buildarchive/r344192/ Log: - STAGE-clean - Remove article from COMMENT line Added: head/www/igal2/files/ head/www/igal2/files/patch-Makefile (contents, props changed) head/www/igal2/files/patch-igal2 (contents, props changed) Modified: head/www/igal2/Makefile head/www/igal2/pkg-plist Modified: head/www/igal2/Makefile ============================================================================== --- head/www/igal2/Makefile Fri Feb 14 11:11:36 2014 (r344191) +++ head/www/igal2/Makefile Fri Feb 14 11:25:38 2014 (r344192) @@ -7,7 +7,9 @@ CATEGORIES= www graphics MASTER_SITES= http://igal.trexler.at/ MAINTAINER= gahr@FreeBSD.org -COMMENT= A simple CLI image gallery generator +COMMENT= Simple CLI image gallery generator + +LICENSE= GPLv2 RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick @@ -17,11 +19,8 @@ EXIF_DESC= Support EXIF data (-e option) CONFLICTS= igal-1.* USES= perl5 NO_BUILD= yes +MAKE_ENV+= DESTDIR=${STAGEDIR} -MAN1= igal2.1 -MANCOMPRESSED= no - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MEXIF} @@ -29,6 +28,9 @@ RUN_DEPENDS+= p5-Image-ExifTool>=7.0:${ .endif post-patch: - ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile ${WRKSRC}/igal2 + ${REINPLACE_CMD} -e 's|%%LIBDIR%%|${PREFIX}/lib/igal2|' ${WRKSRC}/igal2 + +post-install: + ${LN} -sf igal2 ${STAGEDIR}${PREFIX}/bin/igal .include Added: head/www/igal2/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/igal2/files/patch-Makefile Fri Feb 14 11:25:38 2014 (r344192) @@ -0,0 +1,26 @@ +--- Makefile.orig 2014-02-14 12:27:23.000000000 +0100 ++++ Makefile 2014-02-14 12:27:48.000000000 +0100 +@@ -1,11 +1,11 @@ + ############################################################################ + # if you change this, please also modify the value at the top of igal code +-DESTDIR=/usr/local ++DESTDIR?=/usr/local + ############################################################################ + +-BINDIR=$(DESTDIR)/bin +-MANDIR=$(DESTDIR)/man/man1 +-LIBDIR=$(DESTDIR)/lib/igal2 ++BINDIR=$(DESTDIR)$(PREFIX)/bin ++MANDIR=$(DESTDIR)$(PREFIX)/man/man1 ++LIBDIR=$(DESTDIR)$(PREFIX)/lib/igal2 + + OLDLIBDIR=$(DESTDIR)/lib/igal + +@@ -24,7 +24,6 @@ + install:: igal2 + install -d $(BINDIR) + install -m 0755 igal2 $(BINDIR) +- ln -si $(BINDIR)/igal2 $(BINDIR)/igal + install -m 0755 utilities/igal2.sh $(BINDIR) + install -d $(MANDIR) + install -m 0644 igal2.1 $(MANDIR) Added: head/www/igal2/files/patch-igal2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/igal2/files/patch-igal2 Fri Feb 14 11:25:38 2014 (r344192) @@ -0,0 +1,11 @@ +--- igal2.orig 2014-02-14 12:28:33.000000000 +0100 ++++ igal2 2014-02-14 12:28:40.000000000 +0100 +@@ -5,7 +5,7 @@ + ############################################################################ + # Please change this accordingly if you change the DESTDIR in the tarball + # distribution Makefile or the --prefix of the RPM installation +-$LIBDIR = "/usr/local/lib/igal2"; ++$LIBDIR = "%%LIBDIR%%"; + # for example if you make DESTDIR=/usr then $LIBDIR="/usr/lib/igal2" + ############################################################################ + # Modified: head/www/igal2/pkg-plist ============================================================================== --- head/www/igal2/pkg-plist Fri Feb 14 11:11:36 2014 (r344191) +++ head/www/igal2/pkg-plist Fri Feb 14 11:25:38 2014 (r344192) @@ -9,4 +9,5 @@ lib/igal2/igal2.css lib/igal2/indextemplate2.html lib/igal2/slidetemplate2.html lib/igal2/tile.png +man/man1/igal2.1.gz @dirrm lib/igal2