svn commit: r312987 - head/print/photoprint

[Alexey Dokuchaev]

Author: danfe
Date: Tue Feb 26 15:59:15 2013
New Revision: 312987
URL: http://svnweb.freebsd.org/changeset/ports/312987

Log:
  - Remove stray (commented out) line in Makefile
  - Move LICENCE knob where it better belongs
  - Remove duplicate pcre entry from LIB_DEPENDS
  - HAS_CONFIGURE -> GNU_CONFIGURE
  - Fix minor wording bugs in port description
  
  Approved by:	bsam (maintainer)

Modified:
  head/print/photoprint/Makefile
  head/print/photoprint/pkg-descr

Modified: head/print/photoprint/Makefile
==============================================================================
--- head/print/photoprint/Makefile	Tue Feb 26 15:51:22 2013	(r312986)
+++ head/print/photoprint/Makefile	Tue Feb 26 15:59:15 2013	(r312987)
@@ -4,11 +4,12 @@ PORTNAME=	photoprint
 DISTVERSION=	0.4.2-pre2
 CATEGORIES=	print graphics
 MASTER_SITES=	http://www.blackfiveimaging.co.uk/photoprint/
-#DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bsam at FreeBSD.org
 COMMENT=	Utility to print multiple images per sheet
 
+LICENCE=	GPLv2
+
 LIB_DEPENDS=	cups:${PORTSDIR}/print/cups-client \
 		expat:${PORTSDIR}/textproc/expat2 \
 		gdk_pixbuf-2.0:${PORTSDIR}/graphics/gdk-pixbuf2 \
@@ -16,22 +17,20 @@ LIB_DEPENDS=	cups:${PORTSDIR}/print/cups
 		lcms:${PORTSDIR}/graphics/lcms \
 		netpbm:${PORTSDIR}/graphics/netpbm \
 		pcre:${PORTSDIR}/devel/pcre \
-		pcre:${PORTSDIR}/devel/pcre \
 		pixman:${PORTSDIR}/x11/pixman \
 		png15:${PORTSDIR}/graphics/png \
 		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		tiff:${PORTSDIR}/graphics/tiff \
 		xcb:${PORTSDIR}/x11/libxcb
 
-LICENCE=	GPLv2
-
+GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-HAS_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
-CONFIGURE_ARGS+=LDFLAGS=-L/usr/local/lib
 USE_GNOME=	desktopfileutils pango
 USE_XORG=	x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
+INSTALLS_ICONS=	yes
+
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 		- at update-desktop-database

Modified: head/print/photoprint/pkg-descr
==============================================================================
--- head/print/photoprint/pkg-descr	Tue Feb 26 15:51:22 2013	(r312986)
+++ head/print/photoprint/pkg-descr	Tue Feb 26 15:59:15 2013	(r312987)
@@ -1,4 +1,4 @@
-PhotoPrint is a utility to print multiple images per sheet, using
+PhotoPrint is an utility to print multiple images per sheet, using
 Gutenprint, with support for 16-bit images and ICC profiles.
 
-WWW: http://blackfiveimaging.co.uk
+WWW: http://blackfiveimaging.co.uk/