Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Oct 2012 21:12:52 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306639 - in head/graphics/imagesort: . files
Message-ID:  <201210292112.q9TLCqun045283@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Mon Oct 29 21:12:52 2012
New Revision: 306639
URL: http://svn.freebsd.org/changeset/ports/306639

Log:
  - Fix build
  - Add LICENSE
  - Switch to PLIST_FILES
  
  PR:		ports/172017
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Feature safe:	yes

Deleted:
  head/graphics/imagesort/files/
  head/graphics/imagesort/pkg-plist
Modified:
  head/graphics/imagesort/Makefile

Modified: head/graphics/imagesort/Makefile
==============================================================================
--- head/graphics/imagesort/Makefile	Mon Oct 29 21:02:25 2012	(r306638)
+++ head/graphics/imagesort/Makefile	Mon Oct 29 21:12:52 2012	(r306639)
@@ -1,36 +1,48 @@
-# New ports collection makefile for:	imagesort
-# Date created:			Apr 10, 2001
-# Whom:				Mark Pulford <mark@kyne.com.au>
-#
+# Created by: Mark Pulford <mark@kyne.com.au>
 # $FreeBSD$
-#    $MCom: ports/graphics/imagesort/Makefile,v 1.1 2006/10/04 13:18:57 ahze Exp $
 
 PORTNAME=	imagesort
 PORTVERSION=	2.0
 PORTREVISION=	11
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/graphics/viewers/X
+MASTER_SITES=	SUNSITE/apps/graphics/viewers/X
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A flexible X utility for managing many image files
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		gif.5:${PORTSDIR}/graphics/giflib
+LICENSE=	GPLv2
 
-BROKEN=		does not compile
+LIB_DEPENDS=	gif:${PORTSDIR}/graphics/giflib \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		png15:${PORTSDIR}/graphics/png
+
+OPTIONS_DEFINE=	DOCS
 
 USE_XORG=	x11 xt
 USE_GNOME=	imlib
-CFLAGS:=	${CFLAGS} -I${LOCALBASE}/include
+MAKE_JOBS_SAFE=	yes
+
+PORTDOCS=	README imagesortrc.sample
+PLIST_FILES=	bin/imagesort
+
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^CC/s| =| ?=| ; \
+		 /^LIBS/s| =.*| = `imlib-config --libs`| ; \
+		 /^CFLAGS/s| =.*| += `imlib-config --cflags`|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|unsigned int argc|int argc| ; \
+		 s|^#endif.*|#endif|' ${WRKSRC}/imagesort.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/imagesort ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/imagesort
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/imagesort
-	${INSTALL_DATA} ${WRKSRC}/imagesortrc.sample ${PREFIX}/share/doc/imagesort
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>



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