Attachment #27196 for bug #46212

View | Details | Raw Unified | Return to bug 46212
Collapse All | Expand All




#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.post.mk>




--- 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 */

Return to bug 46212

Lines 38-47 Link Here

(-)jigdo/Makefile (-1 / +7 lines)
38	#post-patch:	38	#post-patch:
39	# @${REINPLACE_CMD} -e "s/gtk-config/${GTK_CONFIG}/g" ${WRKSRC}/configure	39	# @${REINPLACE_CMD} -e "s/gtk-config/${GTK_CONFIG}/g" ${WRKSRC}/configure
40		40
		41	.include <bsd.port.pre.mk>
		42
		43	.if ${OSVERSION} >= 500041
		44	EXTRA_PATCHES= ${FILESDIR}/extra-glibc-getopt.h
		45	.endif
		46
41	post-install:	47	post-install:
42	@${STRIP_CMD} ${PREFIX}/bin/jigdo-file	48	@${STRIP_CMD} ${PREFIX}/bin/jigdo-file
43		49
44	post-clean:	50	post-clean:
45	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc	51	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
46		52
47	.include <bsd.port.mk>	53	.include <bsd.port.post.mk>

Line 0 Link Here

(-)jigdo/files/extra-glibc-getopt.h (+23 lines)
	1	--- src/glibc-getopt.h.orig Fri Dec 6 08:24:36 2002
	2	+++ src/glibc-getopt.h Fri Dec 6 08:29:58 2002
	3	@@ -37,12 +37,11 @@
	4	# define ELIDE_CODE
	5	# endif
	6	#endif
	7	+#define ELIDE_CODE
	8	#ifndef ELIDE_CODE
	9	# define opterr my_opterr
	10	# define optind my_optind
	11	# define optopt my_optopt
	12	-#endif
	13	-
	14
	15	#ifdef __cplusplus
	16	extern "C" {
	17	@@ -186,5 +185,6 @@
	18
	19	/* Make sure we later can get all the definitions and declarations. */
	20	#undef __need_getopt
	21	+#endif /* ELIDE_CODE */
	22
	23	#endif /* getopt.h */