Date: Thu, 12 Dec 2002 17:59:35 +0100 (CET) From: bra@fsn.hu To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46212: Fixes build on a recent -CURRENT Message-ID: <200212121659.gBCGxZf3021149@fbsd5.fsn.hu>
next in thread | raw e-mail | index | archive | help
>Number: 46212
>Category: ports
>Synopsis: Fixes build on a recent -CURRENT
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 12 09:10:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: bra@fsn.hu
>Release: FreeBSD 5.0-RC i386
>Organization:
>Environment:
System: FreeBSD fbsd5.fsn.hu 5.0-RC FreeBSD 5.0-RC #2: Fri Dec 6 10:06:17 CET 2002 root@fbsd5.fsn.hu:/usr/obj/usr/src/sys/FBSD5 i386
>Description:
This diff will enable the jigdo port to compile on a FreeBSD system, which
is newer than 500041. (getopt change)
There is a new file, extra-glibc-getopt.h in the diff.
>How-To-Repeat:
>Fix:
--- jigdo.patch begins here ---
diff -ruN jigdo.bak/Makefile jigdo/Makefile
--- jigdo.bak/Makefile Thu Sep 19 22:17:58 2002
+++ jigdo/Makefile Thu Dec 12 17:36:28 2002
@@ -38,10 +38,16 @@
#post-patch:
# @${REINPLACE_CMD} -e "s/gtk-config/${GTK_CONFIG}/g" ${WRKSRC}/configure
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500041
+EXTRA_PATCHES= ${FILESDIR}/extra-glibc-getopt.h
+.endif
+
post-install:
@${STRIP_CMD} ${PREFIX}/bin/jigdo-file
post-clean:
@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN jigdo.bak/files/extra-glibc-getopt.h jigdo/files/extra-glibc-getopt.h
--- jigdo.bak/files/extra-glibc-getopt.h Thu Jan 1 01:00:00 1970
+++ jigdo/files/extra-glibc-getopt.h Thu Dec 12 17:34:06 2002
@@ -0,0 +1,23 @@
+--- src/glibc-getopt.h.orig Fri Dec 6 08:24:36 2002
++++ src/glibc-getopt.h Fri Dec 6 08:29:58 2002
+@@ -37,12 +37,11 @@
+ # define ELIDE_CODE
+ # endif
+ #endif
++#define ELIDE_CODE
+ #ifndef ELIDE_CODE
+ # define opterr my_opterr
+ # define optind my_optind
+ # define optopt my_optopt
+-#endif
+-
+
+ #ifdef __cplusplus
+ extern "C" {
+@@ -186,5 +185,6 @@
+
+ /* Make sure we later can get all the definitions and declarations. */
+ #undef __need_getopt
++#endif /* ELIDE_CODE */
+
+ #endif /* getopt.h */
--- jigdo.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212121659.gBCGxZf3021149>