Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Mar 2000 13:20:31 -0800 (PST)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/17169: Update port: x11/bricons
Message-ID:  <200003032120.NAA63998@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         17169
>Category:       ports
>Synopsis:       Update port: x11/bricons
>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:   Fri Mar  3 13:30:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        3.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix MASTER_SITES
- Support CFLAGS/PREFIX properly

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11/bricons/Makefile x11/bricons/Makefile
--- /usr/ports/x11/bricons/Makefile	Tue Aug 31 19:18:53 1999
+++ x11/bricons/Makefile	Fri Mar  3 08:42:35 2000
@@ -9,8 +9,8 @@
 DISTNAME=	bricons
 PKGNAME=	bricons-3.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.uni-paderborn.de/unix/X11/ftp.x.org/R5contrib/ \
-		ftp://ftp.pasteur.fr/pub/computing/unix/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
+		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
 EXTRACT_SUFX=	-athena-3.0.tar.gz
 
 MAINTAINER=     shanee@augusta.de
@@ -20,11 +20,13 @@
 USE_IMAKE=	yes
 MAN1=		bricons.1
 
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Xbricons
+
 post-install:
-	${INSTALL_DATA} $(WRKDIR)/bricons/Xbricons $(PREFIX)/lib/X11/app-defaults/
-	${INSTALL_DATA} $(WRKDIR)/bricons/bitmaps/* $(PREFIX)/include/X11/bitmaps/
-	${MKDIR} $(PREFIX)/include/X11/pixmaps
-	${INSTALL_DATA} $(WRKDIR)/bricons/*.xpm $(PREFIX)/include/X11/pixmaps/
+	${INSTALL_DATA} ${WRKSRC}/Xbricons ${PREFIX}/lib/X11/app-defaults
+	${INSTALL_DATA} ${WRKSRC}/bitmaps/* ${PREFIX}/include/X11/bitmaps
+	${INSTALL_DATA} ${WRKSRC}/*.xpm ${PREFIX}/include/X11/pixmaps
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "     Use ./files/DOTbriconsrc as an example. This  file"
 	@${ECHO_MSG} "     should  be  stored in the same directory as the"
diff -urN /usr/ports/x11/bricons/patches/patch-aa x11/bricons/patches/patch-aa
--- /usr/ports/x11/bricons/patches/patch-aa	Mon Nov 25 19:00:27 1996
+++ x11/bricons/patches/patch-aa	Fri Mar  3 08:11:02 2000
@@ -28,22 +28,22 @@
   /**/# Here's what to change to customize the installation...
   /**/# Where do you want this stuff (if the defaults aren't okay)?
   
-! BINDIR = /usr/X11R6/bin
-! LIBDIR = /usr/X11R6/lib
-! MANDIR = /usr/X11R6/man/man1
+! XCOMM BINDIR = /home/cur/bri/bin/mbins/${M}bin
+! XCOMM LIBDIR = /home/cur/bri/lib
+! XCOMM MANDIR = /home/cur/bri/Man
   
   /**/# Where is the Xpm header and library files
   /**/# This program needs the Xpm libraries written by Arnaud Le Hors.
   /**/# it can be obtained by anonymous ftp to: export.lcs.mit.edu
   /**/# and from many other sites.
   
-! XPM_DIR =               /usr/X11R6/include/X11
+! XPM_DIR =               $(INCROOT)/X11
   XPM_INCLUDE_DIR =       $(XPM_DIR)
-! XPM_LIB_DIR =           /usr/X11R6/lib
+! XPM_LIB_DIR =           $(LIBDIR)
   
   /**/# This is -g for debugging or -O for optimization (or nothing).
   
-! CDEBUGFLAGS = -O2
+! XCOMM CDEBUGFLAGS = -g
   
   /**/# Nothing to change below here
   
diff -urN /usr/ports/x11/bricons/patches/patch-ac x11/bricons/patches/patch-ac
--- /usr/ports/x11/bricons/patches/patch-ac	Mon Nov 25 19:00:28 1996
+++ x11/bricons/patches/patch-ac	Fri Mar  3 08:14:35 2000
@@ -16,7 +16,7 @@
   ! B.R. Ingram 9th Sept 1991
   *no_of_cols: 			16
 ! *help_file:			bricons
-! *.bitmapFilePath:		/usr/X11R6/include/X11/bitmaps
+! *.bitmapFilePath:		%%PREFIX%%/include/X11/bitmaps
   *borderColor:			yellow
   *popup_layout*.borderColor:	black
   *background:			#ffd28e


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


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




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