Date: Mon, 1 May 2006 14:54:58 +0300 From: "Ion-Mihai "IOnut" Tetcu" <itetcu@people.tecnik93.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/96579: [PATCH] palm/makeztxt: Update to 1.60 and fixes Message-ID: <1146484498.81503@it.buh.tecnik93.com> Resent-Message-ID: <200605011200.k41C0cbp017070@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96579
>Category: ports
>Synopsis: [PATCH] palm/makeztxt: Update to 1.60 and fixes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon May 01 12:00:38 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Ion-Mihai "IOnut" Tetcu
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
Tecnik'93
>Environment:
System: FreeBSD 6.1-PRERELEASE #3: Tue Apr 4 15:35:15 EEST 2006
root@it.buh.tecnik93.com:/usr/obj/usr/src/sys/IT6_U_P
>Description:
Update to 1.60 [1]
- drop files/patch-l* included upstream
- modify files/patch-Makefile and port Makefile to respect CFLAGS
and enable use of getopt_long() on FreeBSD >= 5.0
Requested by: "Andreas Eriksson" <andreas.eriksson@gmail.com> [1]
Tinderbox logs: http://sce-tindy.tecnik93.com/tb-exp/index.php?action=describe_port&id=303
Also tested on amd64 tindy.
>How-To-Repeat:
>Fix:
--- makeztxt.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/palm/makeztxt/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 28 Oct 2005 17:05:15 -0000 1.6
+++ Makefile 1 May 2006 11:47:09 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= makeztxt
-PORTVERSION= 1.43
-PORTREVISION= 1
+PORTVERSION= 1.60
CATEGORIES= palm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gutenpalm
@@ -20,7 +19,18 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GMAKE= yes
+MAKE_ENV+= USEPOSIX=1
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+MAKE_ENV+= LONG_OPTS=1
+.endif
+
+post-patch:
+ ${REINPLACE_CMD} 's/-O2//' ${WRKSRC}/libztxt/Makefile
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/makeztxt ${LOCALBASE}/bin/
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/palm/makeztxt/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 25 Nov 2005 17:09:18 -0000 1.3
+++ distinfo 1 May 2006 11:47:09 -0000
@@ -1,3 +1,3 @@
-MD5 (makeztxt-1.43-src.tar.gz) = 9af951a5b6d7e5633c02cd4b13bb606a
-SHA256 (makeztxt-1.43-src.tar.gz) = e249daa83133594fd9161fcf787730b5454404c8d9171da5928826cf36dd5434
-SIZE (makeztxt-1.43-src.tar.gz) = 28161
+MD5 (makeztxt-1.60-src.tar.gz) = d2f4166191b8ddd1033252de2d4680b5
+SHA256 (makeztxt-1.60-src.tar.gz) = 016b1542e40819e2854cf617c2ab08c7f9aebc26dd613673e81a95603dde7146
+SIZE (makeztxt-1.60-src.tar.gz) = 39508
Index: files/patch-Makefile
===================================================================
RCS file: /home/ncvs/ports/palm/makeztxt/files/patch-Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile
--- files/patch-Makefile 20 Oct 2002 23:10:16 -0000 1.1
+++ files/patch-Makefile 1 May 2006 11:47:09 -0000
@@ -1,26 +1,16 @@
---- Makefile.orig Sat Oct 19 15:38:34 2002
-+++ Makefile Sat Oct 19 15:40:04 2002
-@@ -9,8 +9,8 @@
+--- ./Makefile.orig Mon May 1 14:39:51 2006
++++ ./Makefile Mon May 1 14:40:05 2006
+@@ -9,8 +9,7 @@
LIBS = -lztxt
INCLUDE = -I../common -I.
-CC = gcc
-CFLAGS = -Wall -O2 -pipe $(INCLUDE)
-+CC ?= cc
-+CFLAGS += -Wall $(INCLUDE)
++CFLAGS = -Wall $(INCLUDE)
# GNU make is mandatory
#MAKE = make
-@@ -29,7 +29,7 @@
- # more featureful and faster (on large strings) than POSIX regex.
- # But... maybe you don't have GNU regex.
- # In particular, if compiling with Cygwin, you need this.
--#USEPOSIX = 1
-+USEPOSIX = 1
-
- # DOS, in all its infinite wisdom, decided long ago to differentiate between
- # text files and binary files. Text files get their \n converted to \r\n and
-@@ -44,7 +44,7 @@
+@@ -44,7 +43,7 @@
# If you're on a system that does not have getopt.h or does not have the
# getopt_long() function, comment this out. Regular getopt() will be used.
Index: files/patch-libztxt::ztxt.h
===================================================================
RCS file: files/patch-libztxt::ztxt.h
diff -N files/patch-libztxt::ztxt.h
--- files/patch-libztxt::ztxt.h 20 Oct 2002 23:10:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- libztxt/ztxt.h.old Sat Mar 2 07:03:18 2002
-+++ libztxt/ztxt.h Sun Sep 29 15:46:52 2002
-@@ -31,6 +31,7 @@
- #define _ZTXT_H_ 1
-
-
-+#include <sys/types.h>
- #include <regex.h>
- #include "databaseHdrs.h"
- #include <weasel_common.h>
Index: files/patch-libztxt::ztxt_generate_db.c
===================================================================
RCS file: files/patch-libztxt::ztxt_generate_db.c
diff -N files/patch-libztxt::ztxt_generate_db.c
--- files/patch-libztxt::ztxt_generate_db.c 20 Oct 2002 23:10:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- libztxt/ztxt_generate_db.c.old Sat Mar 2 07:03:18 2002
-+++ libztxt/ztxt_generate_db.c Sun Sep 29 15:51:55 2002
-@@ -30,6 +30,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <regex.h>
- #include "ztxt.h"
Index: files/patch-libztxt::ztxt_init.c
===================================================================
RCS file: files/patch-libztxt::ztxt_init.c
diff -N files/patch-libztxt::ztxt_init.c
--- files/patch-libztxt::ztxt_init.c 20 Oct 2002 23:10:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- libztxt/ztxt_init.c.old Sat Mar 2 07:03:18 2002
-+++ libztxt/ztxt_init.c Sun Sep 29 15:52:33 2002
-@@ -30,6 +30,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include "ztxt.h"
-
Index: files/patch-libztxt::ztxt_list_bookmarks.c
===================================================================
RCS file: files/patch-libztxt::ztxt_list_bookmarks.c
diff -N files/patch-libztxt::ztxt_list_bookmarks.c
--- files/patch-libztxt::ztxt_list_bookmarks.c 20 Oct 2002 23:10:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- libztxt/ztxt_list_bookmarks.c.old Sat Mar 2 07:03:18 2002
-+++ libztxt/ztxt_list_bookmarks.c Sun Sep 29 15:52:10 2002
-@@ -29,6 +29,7 @@
-
- #include <stdio.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
-
- #include "ztxt.h"
Index: files/patch-libztxt::ztxt_process.c
===================================================================
RCS file: files/patch-libztxt::ztxt_process.c
diff -N files/patch-libztxt::ztxt_process.c
--- files/patch-libztxt::ztxt_process.c 17 Aug 2004 21:11:50 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
---- libztxt/ztxt_process.c.orig Sat Mar 2 07:03:18 2002
-+++ libztxt/ztxt_process.c Sat Aug 14 13:35:00 2004
-@@ -30,6 +30,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include <zlib.h>
- #include "ztxt.h"
-@@ -140,7 +141,7 @@
- break;
-
- case 2:
-- default:
-+ default:;
- /* Just leave the next alone. No linefeed stripping. */
- }
-
Index: files/patch-libztxt::ztxt_set.c
===================================================================
RCS file: files/patch-libztxt::ztxt_set.c
diff -N files/patch-libztxt::ztxt_set.c
--- files/patch-libztxt::ztxt_set.c 20 Oct 2002 23:10:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- libztxt/ztxt_set.c.old Sat Mar 2 07:03:18 2002
-+++ libztxt/ztxt_set.c Sun Sep 29 15:52:21 2002
-@@ -28,6 +28,7 @@
- */
-
- #include <string.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include "ztxt.h"
-
--- makeztxt.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1146484498.81503>