From owner-freebsd-ports  Mon Jun 26  8:20:45 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 9EEE537B90F
	for <freebsd-ports@FreeBSD.org>; Mon, 26 Jun 2000 08:20:05 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id IAA56904;
	Mon, 26 Jun 2000 08:20:05 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5764737B8C8; Mon, 26 Jun 2000 08:19:39 -0700 (PDT)
Message-Id: <20000626151939.5764737B8C8@hub.freebsd.org>
Date: Mon, 26 Jun 2000 08:19:39 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/19527: Update port: x11-fm/xnc
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         19527
>Category:       ports
>Synopsis:       Update port: x11-fm/xnc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 26 08:20:05 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Use ports version of shared libs

New file:
patches/patch-ad

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11-fm/xnc/Makefile x11-fm/xnc/Makefile
--- /usr/ports/x11-fm/xnc/Makefile	Sat Jun 24 00:10:42 2000
+++ x11-fm/xnc/Makefile	Sat Jun 24 16:20:29 2000
@@ -23,10 +23,14 @@
 #		unarj:${PORTSDIR}/archivers/unarj	\
 #		lha:${PORTSDIR}/archivers/lha		\
 #		bzip2:${PORTSDIR}/archivers/bzip2
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.3:${PORTSDIR}/graphics/png
 
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME}
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		es.1 ives.1 vs.1 xjpegroot.1 xnc.1 xnlaunch.1
 
@@ -35,6 +39,6 @@
 		${MKDIR} ${PREFIX}/share/doc/xnc
 		${INSTALL_DATA} ${WRKSRC}/Docs/* ${PREFIX}/share/doc/xnc
 .endif
-		@${CAT} ${PKGDIR}/MESSAGE
+		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/x11-fm/xnc/patches/patch-ae x11-fm/xnc/patches/patch-ae
--- /usr/ports/x11-fm/xnc/patches/patch-ae	Thu Jan  1 09:00:00 1970
+++ x11-fm/xnc/patches/patch-ae	Sat Jun 24 16:13:13 2000
@@ -0,0 +1,56 @@
+--- image/makefile.in.orig	Tue Jan 18 17:35:15 2000
++++ image/makefile.in	Sat Jun 24 15:56:50 2000
+@@ -31,31 +31,31 @@
+ all:: libie.a $(PNGDEP) $(ZDEP)
+ 
+ 24to8.o: 24to8.c
+-	 $(CC) -c 24to8.c $(CXXOPT) $(INCLUDES)
++	 $(CC) -c 24to8.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
+ 
+ jpeg.o: jpeg.c
+-	 $(CC) -c jpeg.c $(CXXOPT) $(INCLUDES)
++	 $(CC) -c jpeg.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
+ 
+ pcdr.o: pcdr.c
+-	 $(CC) -c pcdr.c $(CXXOPT) $(INCLUDES)
++	 $(CC) -c pcdr.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
+ 
+ inter.o: inter.c
+-	 $(CC) -c inter.c $(CXXOPT) $(INCLUDES)
++	 $(CC) -c inter.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
+ 
+ huff.o: huff.c
+-	 $(CC) -c huff.c $(CXXOPT) $(INCLUDES)
++	 $(CC) -c huff.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
+ 
+ file.o: file.c
+-	 $(CC) -c file.c $(CXXOPT) $(INCLUDES)
++	 $(CC) -c file.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
+ 
+ yuv2rgb.o: yuv2rgb.c
+-	 $(CC) -c yuv2rgb.c $(CXXOPT) $(INCLUDES)
++	 $(CC) -c yuv2rgb.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
+ 
+ tiffr.o: tiffr.c
+-	 $(CC) -c tiffr.c $(CXXOPT)  $(INCLUDES) -I/usr/local/include -I/usr/include/gr
++	 $(CC) -c tiffr.c $(CXXOPT)  $(INCLUDES) $(CPPFLAGS)
+ 
+ png.o: png.c
+-	 $(CC) -c png.c $(CXXOPT) $(INCLUDES) $(ZINC) $(PNGINC)
++	 $(CC) -c png.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS) $(ZINC) $(PNGINC)
+ 
+ ../zlib/libz.a:
+ 	cd ../zlib && make
+@@ -64,10 +64,10 @@
+ 	cd ../libpng && make
+ 
+ pcxr.o: pcxr.c
+-	 $(CC) -c pcxr.c $(CXXOPT) $(INCLUDES)
++	 $(CC) -c pcxr.c $(CXXOPT) $(INCLUDES) $(CPPFLAGS)
+ 
+ accel.o: accel.c
+-	 $(CC) -c accel.c $(CFLAGS)
++	 $(CC) -c accel.c $(CFLAGS) $(CPPFLAGS)
+ 
+ libie.a: $(IOBJS)
+ 	 $(RM) -f libie.a


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message