ports/148433: [patch] graphics/acidwarp: respect LOCALBASE

[Anonymous]

>Number:         148433
>Category:       ports
>Synopsis:       [patch] graphics/acidwarp: respect LOCALBASE, modernize Makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 07 17:30:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
LOCALBASE=/usr/pkg
PREFIX=$HOME/aaa

LD_RUN_PATH=/usr/lib32 +
http://docs.freebsd.org/cgi/mid.cgi?86tyobk6bu.fsf
>Description:
- respect LOCALBASE in CFLAGS
- prefer PLIST_FILES and PORTDOCS to `dynamic plist'
- use BINMODE rather than using INSTALL directly

The rest are cosmetic.
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: graphics/acidwarp/Makefile
===================================================================
RCS file: /a/.cvsup/ports/graphics/acidwarp/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- graphics/acidwarp/Makefile	7 May 2006 23:45:49 -0000	1.8
+++ graphics/acidwarp/Makefile	7 Jul 2010 17:22:02 -0000
@@ -12,40 +12,33 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/hacks/svgalib
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=SVGAlib demo which displays trippy mathematical images in cycling colors
+COMMENT=	SVGAlib demo which displays trippy mathematical images in cycling colors
 
 LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
 
-ALL_TARGET=	acidwarp
-DOCFILES=	README TODO Thanks
 ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/pkg-plist
-REINPLACE_ARGS=	-i'' -E
-WRKSRC=		${WRKDIR}/acidwarp
+ALL_TARGET=	${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-post-extract:
-	${RM} ${WRKSRC}/acidwarp
+PLIST_FILES=	bin/acidwarp
+PORTDOCS=	README TODO Thanks
 
-post-patch:
-	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile
+.include <bsd.port.pre.mk>
 
-pre-install:
-	${ECHO_CMD} "bin/acidwarp" > ${PLIST}
-.if !defined(NOPORTDOCS)
-.for i in ${DOCFILES}
-	${ECHO_CMD} -n "share/doc/acidwarp/" >> ${PLIST}
-	${ECHO_CMD} ${i} >> ${PLIST}
-.endfor
-	${ECHO_CMD} "@dirrm share/doc/acidwarp" >> ${PLIST}
+.if !defined(WITHOUT_SETUID)
+BINMODE=	4555
 .endif
 
+post-extract:	.SILENT
+	${RM} -f ${WRKSRC}/acidwarp
+
 do-install:
-	${INSTALL} -c -g wheel -o root -m 4755 ${WRKSRC}/acidwarp ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/acidwarp ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/acidwarp
-.for i in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/acidwarp
+	${MKDIR} ${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: graphics/acidwarp/files/patch-Makefile
===================================================================
RCS file: /a/.cvsup/ports/graphics/acidwarp/files/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- graphics/acidwarp/files/patch-Makefile	22 Oct 2000 10:54:37 -0000	1.1
+++ graphics/acidwarp/files/patch-Makefile	7 Jul 2010 16:53:11 -0000
@@ -4,7 +4,7 @@
 -CC=gcc
 -CFLAGS = -O2 -funroll-all-loops
 +CC ?= gcc
-+CFLAGS += -L%%PREFIX%%/lib -I%%PREFIX%%/include
++CFLAGS += -L$(LOCALBASE)/lib -I$(LOCALBASE)/include
  LFLAGS = -lvgagl -lvga
  PROGS = acidwarp 
  OSOURCES = bit_map.o palinit.o rolnfade.o lut.o
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: