svn commit: r370130 - in head/palm/pilot-link: . files

[Antoine Brodin]

Author: antoine
Date: Sun Oct  5 21:36:02 2014
New Revision: 370130
URL: https://svnweb.freebsd.org/changeset/ports/370130
QAT: https://qat.redports.org/buildarchive/r370130/

Log:
  Allow building on head

Added:
  head/palm/pilot-link/files/patch-popt__popthelp.c   (contents, props changed)
Modified:
  head/palm/pilot-link/Makefile
  head/palm/pilot-link/pkg-plist

Modified: head/palm/pilot-link/Makefile
==============================================================================
--- head/palm/pilot-link/Makefile	Sun Oct  5 21:30:26 2014	(r370129)
+++ head/palm/pilot-link/Makefile	Sun Oct  5 21:36:02 2014	(r370130)
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-I${WRKSRC}/popt -I${LOCALBASE}/include
 CONFIGURE_ARGS+=${ICONV_CONFIGURE_BASE}  --with-included-popt --enable-conduits --enable-xsltproc
 INSTALL_TARGET=	install-strip
-USES=		iconv libtool pathfix pkgconfig tar:bzip2
+USES=		iconv libtool pathfix pkgconfig readline tar:bzip2
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	PNG THREADS USB
@@ -49,6 +49,7 @@ CONFIGURE_ARGS+=	--disable-png
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} '/enable_werror="yes"/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|png_voidp_NULL|NULL|g' \
 		-e 's|png_error_ptr_NULL|NULL|g' \
 		${WRKSRC}/src/pilot-read-notepad.c \

Added: head/palm/pilot-link/files/patch-popt__popthelp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/palm/pilot-link/files/patch-popt__popthelp.c	Sun Oct  5 21:36:02 2014	(r370130)
@@ -0,0 +1,11 @@
+--- popt/popthelp.c.orig	2004-08-25 15:06:39 UTC
++++ popt/popthelp.c
+@@ -683,7 +683,7 @@
+     s[0] = '\0';
+     /*@-branchstate@*/		/* FIX: W2DO? */
+     if (str == NULL) {
+-	memset(s, 0, sizeof(s));
++	memset(s, 0, 300);
+ 	str = s;
+     }
+     /*@=branchstate@*/

Modified: head/palm/pilot-link/pkg-plist
==============================================================================
--- head/palm/pilot-link/pkg-plist	Sun Oct  5 21:30:26 2014	(r370129)
+++ head/palm/pilot-link/pkg-plist	Sun Oct  5 21:36:02 2014	(r370130)
@@ -137,7 +137,3 @@ man/man1/pilot-read-screenshot.1.gz
 man/man1/pilot-read-todos.1.gz
 man/man1/pilot-read-veo.1.gz
 man/man7/pilot-link.7.gz
- at dirrm %%DATADIR%%/udev
- at dirrm %%DATADIR%%/prc
- at dirrm %%DATADIR%%/pix
- at dirrm %%DATADIR%%