3 files changed, 15 insertions, 13 deletions

diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index 1832b12da46d..874347acab8a 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -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 @@ LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
 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 --git a/x11/bricons/files/patch-aa b/x11/bricons/files/patch-aa
index fe3ca6990f81..a559725121f7 100644
--- a/x11/bricons/files/patch-aa
+++ b/x11/bricons/files/patch-aa
@@ -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 --git a/x11/bricons/files/patch-ac b/x11/bricons/files/patch-ac
index 2d7fa06f2e98..ba87b18d4bc4 100644
--- a/x11/bricons/files/patch-ac
+++ b/x11/bricons/files/patch-ac
@@ -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