ports/74299: [patch] www/wb0: Fix packaging
Volker Stolz
vs at FreeBSD.org
Tue Nov 23 17:30:29 UTC 2004
>Number: 74299
>Category: ports
>Synopsis: [patch] www/wb0: Fix packaging
>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: Tue Nov 23 17:30:28 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Volker Stolz
>Release: FreeBSD 4.10-STABLE i386
>Organization:
Lehrstuhl für Informatik II; RWTH Aachen Universität
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.10-STABLE FreeBSD 4.10-STABLE #20: Thu Oct 28 13:24:05 CEST 2004 root at menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386
>Description:
Pointyhat noted that there was a packaging error and port has been marked
DEPRECATED for while now:
http://pointyhat.freebsd.org/errorlogs/i386-5-full-logs/wb0-000324_1.log.bz2
Cleaning up the packaging fixes the problem. Somehow the for/find combination
is bogus.
>How-To-Repeat:
>Fix:
Added file: pkg-plist
--- wb0.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/freebsdcvs/cvs-ports/ports/www/wb0/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 21 Jun 2004 21:27:45 -0000 1.13
+++ Makefile 23 Nov 2004 17:11:58 -0000
@@ -15,48 +15,28 @@
MAINTAINER= trevor at FreeBSD.org
COMMENT= Web browser for svgalib which can show pictures
-BROKEN= incorrect packing list
-EXPIRATION_DATE=2004-08-20
-DEPRECATED= ${BROKEN}
RUN_DEPENDS= lynx:${PORTSDIR}/www/lynx-current
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
vga.1:${PORTSDIR}/graphics/svgalib \
png.5:${PORTSDIR}/graphics/png
-DOCDIR= share/doc/${PORTNAME}
-DOCS= AUTHORS Changelog README
+USE_REINPLACE= yes
+
+PORTDOCS= AUTHORS Changelog README
ONLY_FOR_ARCHS= i386
-PLIST= ${WRKDIR}/pkg-plist
post-patch:
- @${MV} ${WRKSRC}/wb0.c ${WRKSRC}/wb0.c.orig
- @${SED} -e 's|/etc/wb0|${LOCALBASE}/etc|g ; \
+ @${REINPLACE_CMD} -e 's|/etc/wb0|${LOCALBASE}/etc|g ; \
s|/usr/local/src/wb0/font/bit|${LOCALBASE}/share/wb0/|g' \
- < ${WRKSRC}/wb0.c.orig > ${WRKSRC}/wb0.c
-
-pre-install:
- ${ECHO_CMD} bin/wb0 > ${PLIST}
-.if !defined(NOPORTDOCS)
-.for i in ${DOCS}
- ${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
-.endfor
- ${ECHO_CMD} ${DOCDIR}/wb0.config.README >> ${PLIST}
- ${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
-.endif
- ${ECHO_CMD} etc/wb0.config >> ${PLIST}
- for i in `${FIND} ${PREFIX}/share/wb0 -type f`; \
- do ${ECHO_CMD} share/wb0/`${BASENAME} $${i}` >> ${PLIST}; \
- done
- ${ECHO_CMD} @dirrm share/wb0 >> ${PLIST}
+ ${WRKSRC}/wb0.c
post-install:
.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/${DOCDIR}
-.for i in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}
+ ${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
- ${INSTALL_DATA} ${WRKSRC}/etc/wb0/wb0.config.README ${PREFIX}/${DOCDIR}
- ${ECHO} ${DOCDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/etc/wb0/wb0.config.README ${DOCSDIR}
.endif
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg-plist 23 Nov 2004 17:12:28 -0000
@@ -0,0 +1,11 @@
+bin/wb0
+etc/wb0.config
+share/wb0/iso_8859-2.bit
+share/wb0/kamen.encoding
+share/wb0/iso_8859-2.encoding
+share/wb0/pc-latin-2.encoding
+share/wb0/iso_8859-1.encoding
+share/wb0/cp1250.encoding
+share/wb0/cork.encoding
+ at dirrm share/wb0
+%%PORTDOCS%%%%DOCSDIR%%/wb0.config.README
--- wb0.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list