Subject: update for netpbm package
To: None <tech-pkg@netbsd.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 09/25/2003 10:47:42
I noticed in April and today that netpbm install doesn't work right with
the versions of tar (today gtar 1.13.25) I have been using (under Linux):
/bin/tar -cf - * | /bin
/tar -xpC /usr -f -
/bin/tar: bin: Cannot unlink: Directory not empty
/bin/tar: include: Cannot unlink: Directory not empty
/bin/tar: lib: Cannot unlink: Directory not empty
/bin/tar: man: Cannot unlink: Directory not empty
/bin/tar: man/man1: Cannot unlink: Directory not empty
/bin/tar: man/man3: Cannot unlink: Directory not empty
/bin/tar: man/man5: Cannot unlink: Directory not empty
/bin/tar: share: Cannot unlink: Directory not empty
/bin/tar: share/doc: Cannot unlink: Directory not empty
/bin/tar: share/doc/netpbm: Cannot unlink: Directory not empty
/bin/tar: share/netpbm: Cannot unlink: Directory not empty
/bin/tar: Error exit delayed from previous errors
*** Error code 2
Can I commit this following patch? (I have more comments below.)
diff -b -u -r1.80 Makefile
--- graphics/netpbm/Makefile 2003/09/17 19:40:35 1.80
+++ graphics/netpbm/Makefile 2003/09/25 17:37:37
@@ -60,8 +60,7 @@
${TEST} -d "${PREFIX}/$${DIR}" || \
${ECHO} "@dirrm $${DIR}"; \
done >>${PLIST_SRC} && \
- ${GTAR} -cf - * | ${GTAR} -xpC ${PREFIX} -f -
- ${RM} -fr ${STAGEDIR}
+ ${PAX} -rw . ${PREFIX}
.include "../../graphics/png/buildlink2.mk"
.include "../../graphics/tiff/buildlink2.mk"
I removed the removal of STAGEDIR too. I wasn't sure if it was really
needed. It is in the WRKDIR.
Also, I see it checks for /usr/bin/flex -- this is good. But why only for
Linux? (Is it because flex is in a different path on other operating
systems?)
Maybe the BUILD_DEPENDS+= flex in the SunOS check can be removed and then:
.if !exists(/usr/bin/flex)
BUILD_DEPENDS+= flex>=2.5.4:../../devel/flex
LEX = ${LOCALBASE}/bin/flex
.endif
Then netpbm-10.11.8/Makefile.config could be changed to
LEX ?= flex
(For patch-aa.)
Jeremy C. Reed
http://bsd.reedmedia.net/