From ishmael@babylon.merseine.nu  Sun Nov  5 16:46:04 2000
Return-Path: <ishmael@babylon.merseine.nu>
Received: from babylon.merseine.nu (c418236-a.clmba1.mo.home.com [24.12.203.134])
	by hub.freebsd.org (Postfix) with ESMTP id C3F0B37B4D7
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  5 Nov 2000 16:46:00 -0800 (PST)
Received: (from ishmael@localhost)
	by babylon.merseine.nu (8.11.1/8.11.1) id eA60kuR01676;
	Sun, 5 Nov 2000 18:46:56 -0600 (CST)
	(envelope-from ishmael)
Message-Id: <200011060046.eA60kuR01676@babylon.merseine.nu>
Date: Sun, 5 Nov 2000 18:46:56 -0600 (CST)
From: ishmael27@home.com
Sender: ishmael@babylon.merseine.nu
Reply-To: ishmael27@home.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: Changes and maintance of graphics/imlib2-tmp
X-Send-Pr-Version: 3.2

>Number:         22629
>Category:       ports
>Synopsis:       Changes and maintance of graphics/imlib2-tmp
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 05 16:50:01 PST 2000
>Closed-Date:    Tue Nov 7 06:33:02 PST 2000
>Last-Modified:  Tue Nov 07 06:33:17 PST 2000
>Originator:     Jeremy Norris
>Release:        FreeBSD 4.1.1-STABLE i386
>Organization:
>Environment:

FreeBSD babylon.merseine.nu 4.1.1-STABLE i386
	

>Description:

This update changes MASTER_SITES to more readily available
MASTER_SITE_SOURCEFORGE, adds patch-aa, which cleans up the imlib2-config
script installed.
Also, I'm assuing MAINTAINER-ship of this port (which I originally
created/submitted).
	

>How-To-Repeat:

	

>Fix:

diff -urN ../cvs/imlib2-tmp/Makefile ./Makefile
--- ../cvs/imlib2-tmp/Makefile	Fri Nov  3 02:18:07 2000
+++ ./Makefile	Sun Nov  5 18:19:16 2000
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	imlib2
 # Date created:		16 Oct 2000
-# Whom:			>Jeremy Norris <ishmael27@home.com>
+# Whom:			Jeremy Norris <ishmael27@home.com>
 #
 # $FreeBSD: ports/graphics/imlib2-tmp/Makefile,v 1.70 2000/11/03 08:18:07 nakai Exp $
 #
 
 PORTNAME=	imlib2
 PORTVERSION=	1.0.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/ \
-		http://www.us.rasterman.com/files/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	enlightenment
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ishmael27@home.com
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
@@ -32,8 +32,16 @@
 CONFIGURE_ARGS=	--enable-mmx
 .endif
 
+post-configure:
+	@${PERL} -pi -e 's|\@localbase\@|${LOCALBASE}|g' ${WRKSRC}/imlib2-config
+
 post-install:
-	strip ${PREFIX}/lib/libImlib2.so.1
-	strip ${PREFIX}/lib/loaders/filter/*
-	strip ${PREFIX}/lib/loaders/image/*
+	@strip ${PREFIX}/lib/libImlib2.so.1
+.for i in bump_map colormod testfilter
+	@strip ${PREFIX}/lib/loaders/filter/${i}.so
+.endfor
+.for i in argb bmp db gif jpeg png pnm tga tiff xpm
+	@strip ${PREFIX}/lib/loaders/image/${i}.so
+.endfor
+
 .include <bsd.port.post.mk>
diff -urN ../cvs/imlib2-tmp/files/patch-aa ./files/patch-aa
--- ../cvs/imlib2-tmp/files/patch-aa	Wed Dec 31 18:00:00 1969
+++ ./files/patch-aa	Sun Oct 29 21:38:22 2000
@@ -0,0 +1,11 @@
+--- imlib2-config.in.orig	Tue Aug 22 16:38:40 2000
++++ imlib2-config.in	Sun Oct 29 21:38:09 2000
+@@ -45,7 +45,7 @@
+       echo $includes @x_cflags@
+       ;;
+     --libs)
+-      libdirs=-L@libdir@
++      libdirs="-L@libdir@ -L@localbase@/lib"
+       echo $libdirs -lImlib2 -lttf -lm @dlopen_libs@ @x_ldflags@ @x_libs@
+       ;;
+     *)
	


>Release-Note:
>Audit-Trail:

From: Jeremy Norris <ishmael27@home.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/22629: Changes and maintance of graphics/imlib2-tmp
Date: Sun, 5 Nov 2000 19:00:58 -0600

 Forgot to bump PORTREVISION.
 Here's a revised patch.
 
 
 diff -urN ../cvs/imlib2-tmp/Makefile ./Makefile
 --- ../cvs/imlib2-tmp/Makefile	Fri Nov  3 02:18:07 2000
 +++ ./Makefile	Sun Nov  5 18:19:16 2000
 @@ -1,17 +1,18 @@
  # New ports collection makefile for:	imlib2
  # Date created:		16 Oct 2000
 -# Whom:			>Jeremy Norris <ishmael27@home.com>
 +# Whom:			Jeremy Norris <ishmael27@home.com>
  #
  # $FreeBSD: ports/graphics/imlib2-tmp/Makefile,v 1.70 2000/11/03 08:18:07 nakai Exp $
  #
  
  PORTNAME=	imlib2
  PORTVERSION=	1.0.0
 +PORTREVISION=	1
  CATEGORIES=	graphics
 -MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/ \
 -		http://www.us.rasterman.com/files/
 +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 +MASTER_SITE_SUBDIR=	enlightenment
  
 -MAINTAINER=	ports@FreeBSD.ORG
 +MAINTAINER=	ishmael27@home.com
  
  LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
  		tiff.4:${PORTSDIR}/graphics/tiff \
 @@ -32,8 +32,16 @@
  CONFIGURE_ARGS=	--enable-mmx
  .endif
  
 +post-configure:
 +	@${PERL} -pi -e 's|\@localbase\@|${LOCALBASE}|g' ${WRKSRC}/imlib2-config
 +
  post-install:
 -	strip ${PREFIX}/lib/libImlib2.so.1
 -	strip ${PREFIX}/lib/loaders/filter/*
 -	strip ${PREFIX}/lib/loaders/image/*
 +	@strip ${PREFIX}/lib/libImlib2.so.1
 +.for i in bump_map colormod testfilter
 +	@strip ${PREFIX}/lib/loaders/filter/${i}.so
 +.endfor
 +.for i in argb bmp db gif jpeg png pnm tga tiff xpm
 +	@strip ${PREFIX}/lib/loaders/image/${i}.so
 +.endfor
 +
  .include <bsd.port.post.mk>
 diff -urN ../cvs/imlib2-tmp/files/patch-aa ./files/patch-aa
 --- ../cvs/imlib2-tmp/files/patch-aa	Wed Dec 31 18:00:00 1969
 +++ ./files/patch-aa	Sun Oct 29 21:38:22 2000
 @@ -0,0 +1,11 @@
 +--- imlib2-config.in.orig	Tue Aug 22 16:38:40 2000
 ++++ imlib2-config.in	Sun Oct 29 21:38:09 2000
 +@@ -45,7 +45,7 @@
 +       echo $includes @x_cflags@
 +       ;;
 +     --libs)
 +-      libdirs=-L@libdir@
 ++      libdirs="-L@libdir@ -L@localbase@/lib"
 +       echo $libdirs -lImlib2 -lttf -lm @dlopen_libs@ @x_ldflags@ @x_libs@
 +       ;;
 +     *)
 
State-Changed-From-To: open->closed 
State-Changed-By: kevlo 
State-Changed-When: Tue Nov 7 06:33:02 PST 2000 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22629 
>Unformatted:
