ports/97935: [MAINTAINER UPDATE] www/quickie: 1.0 -> 1.1
Shaun Amott
shaun at inerd.com
Thu May 25 22:17:20 UTC 2006
>Number: 97935
>Category: ports
>Synopsis: [MAINTAINER UPDATE] www/quickie: 1.0 -> 1.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu May 25 22:10:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Shaun Amott
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
>Description:
- Update quickie to 1.1
- Fix build on 4.x
Tinderbox tested on : 5.x (sparc64)
Manually tested on : 6.x (i386), 4.x (i386)
>How-To-Repeat:
>Fix:
--- quickie-1.1.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/quickie/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 17 May 2006 13:48:19 -0000 1.1
+++ Makefile 25 May 2006 21:51:59 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= quickie
-PORTVERSION= 1.0
+PORTVERSION= 1.1
CATEGORIES= www
MASTER_SITES= http://${PORTNAME}.sourceforge.net/ \
http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -20,6 +20,8 @@
--sysconfdir=${PREFIX}/etc \
--localstatedir=${DATADIR}
+CFLAGS:= ${CFLAGS} -I${LOCALBASE}/include
+
MAN1= quickie-config.1 quickie_prime.1 quickie.1 quickie_svt.1 \
quickie_license.1 quickie_post_install.1
@@ -39,12 +41,18 @@
.include <bsd.port.pre.mk>
.if (${OSVERSION} < 500041)
-BROKEN= does not compile on 4.x; needs a newer libc
+LIB_DEPENDS+= gnugetopt.[1-9]:${PORTSDIR}/devel/libgnugetopt
.endif
post-patch:
@${CP} ${FILESDIR}/freebsd.h ${WRKSRC}/lib
- @${REINPLACE_CMD} -e 's#var/[^ ]*\.man##g' ${WRKSRC}/Makefile.in
+
+post-configure:
+.if (${OSVERSION} < 500041)
+ @${REINPLACE_CMD} -e 's#^\(LDFLAGS = .*\)#\1 -L${LOCALBASE}/lib#' \
+ -e 's#^\(LIBS = .*\)#\1 -lgnugetopt#' \
+ ${WRKSRC}/Makefile
+.endif
pre-install:
@${MKDIR} ${DATADIR}/admin
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/quickie/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo 17 May 2006 13:48:19 -0000 1.1
+++ distinfo 25 May 2006 21:51:59 -0000
@@ -1,6 +1,4 @@
-MD5 (quickie-1.0.tar.gz) = 5dca1346dfbe034d8e43061763b9fb92
-SHA256 (quickie-1.0.tar.gz) = cdf17e935852f3e9d5b6928bea71e7acaf40f5b6df8779595927b13cea1eb93f
-SIZE (quickie-1.0.tar.gz) = 274016
-MD5 (quickie-1.0.pdf) = f9c2db25e11e0baf250d39bec0273e29
-SHA256 (quickie-1.0.pdf) = 2963b7cb55095f2970bcd9a1193bea31916f0ee219f64a9fb40fefb77a7873e4
-SIZE (quickie-1.0.pdf) = 110380
+MD5 (quickie-1.1.tar.gz) = 05d1c560d571c32fbb6b37ac9607b2c8
+SIZE (quickie-1.1.tar.gz) = 278045
+MD5 (quickie-1.1.pdf) = c09ecedf4e04905ca44297983df99297
+SIZE (quickie-1.1.pdf) = 76778
Index: files/patch-lib_arglex.cc
===================================================================
RCS file: files/patch-lib_arglex.cc
diff -N files/patch-lib_arglex.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-lib_arglex.cc 25 May 2006 21:51:59 -0000
@@ -0,0 +1,14 @@
+--- lib/arglex.cc.orig Sat May 20 23:56:52 2006
++++ lib/arglex.cc Thu May 25 12:36:38 2006
+@@ -21,6 +21,11 @@
+
+ #include <cctype>
+
++#ifdef __FreeBSD__
++#include <unistd.h>
++#include <stdio.h>
++#endif
++
+ #include <arglex.h>
+ #include <progname.h>
+ #include <quit.h>
Index: files/patch-lib_quit.cc
===================================================================
RCS file: files/patch-lib_quit.cc
diff -N files/patch-lib_quit.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-lib_quit.cc 25 May 2006 21:51:59 -0000
@@ -0,0 +1,14 @@
+--- lib/quit.cc.orig Sat May 20 23:56:52 2006
++++ lib/quit.cc Thu May 25 12:40:10 2006
+@@ -21,6 +21,11 @@
+
+ #pragma implementation "quit"
+
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/stat.h>
++#endif
++
+ #include <cerrno>
+ #include <cstdarg>
+ #include <cstdio>
Index: files/patch-quickie-config_main.cc
===================================================================
RCS file: files/patch-quickie-config_main.cc
diff -N files/patch-quickie-config_main.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-quickie-config_main.cc 25 May 2006 21:51:59 -0000
@@ -0,0 +1,17 @@
+--- quickie-config/main.cc.orig Sat May 20 23:56:52 2006
++++ quickie-config/main.cc Thu May 25 12:57:25 2006
+@@ -24,7 +24,13 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <unistd.h>
+-#include <getopt.h>
++
++#ifdef __FreeBSD__
++//# include <osreldate.h>
++//# if __FreeBSD_version < 500041
++# include <getopt.h>
++//# endif
++#endif
+
+ #include <configuration.h>
+ #include <progname.h>
--- quickie-1.1.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list