Date: Tue, 12 Feb 2013 16:36:06 +0900 From: Takefu <takefu@airport.fm> To: freebsd-gnats-submit@freebsd.org Cc: skv@FreeBSD.org Subject: ports/176050: [PATCH] lang/perl5.12,perl5.14,perl5.16: fix OptionsNG Message-ID: <5119F0E6.4050102@airport.fm> Resent-Message-ID: <201302120740.r1C7e1WN018944@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176050
>Category: ports
>Synopsis: [PATCH] lang/perl5.12,perl5.14,perl5.16: fix OptionsNG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 12 07:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Takefu
>Release: FreeBSD 7.4-RELEASE-p11 i386
>Organization:
FOX Amateur Radio Club
>Environment:
System: FreeBSD RELENG74.localIPv4.airport.fm 7.4-RELEASE-p11 FreeBSD 7.4-RELEASE-p11 #0: Tue Dec 4 15:31:56 JST
>Description:
- fix OptionsNG
Port maintainer (skv@FreeBSD.org) is cc'd.
>How-To-Repeat:
>Fix:
--- perl.patch begins here ---
--- /usr/ports/lang/perl5.12/Makefile 2012-11-17 14:58:54.000000000 +0900
+++ lang/perl5.12/Makefile 2013-02-12 12:27:50.000000000 +0900
@@ -1,7 +1,4 @@
-# New ports collection makefile for: perl5
-# Date created: 16 April 1995
-# Whom: markm
-#
+# Created by: markm
# $FreeBSD: ports/lang/perl5.12/Makefile,v 1.141 2012/11/17 05:58:54 svnexp Exp $
#
@@ -29,15 +26,16 @@
perl-5.14.* perl-threaded-5.14.* \
perl-5.16.* perl-threaded-5.16.*
-OPTIONS= DEBUGGING "Build with debugging support" off \
- GDBM "Build GDBM_File extension" off \
- PERL_MALLOC "Use Perl malloc" off \
- PERL_64BITINT "Use 64 bit integers (on i386)" on \
- THREADS "Build threaded perl" off \
- PTHREAD "Build with -pthread" on \
- MULTIPLICITY "Use multiplicity" off \
- SITECUSTOMIZE "Run-time customization of @INC" off \
- USE_PERL "Rewrite links in /usr/bin" on
+OPTIONS_DEFINE= DEBUGGING GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD\
+ MULTIPLICITY SITECUSTOMIZE USE_PERL
+OPTIONS_DEFAULT=PERL_64BITINT PTHREAD USE_PERL
+DEBUGGING_DESC= Build with debugging support
+PERL_MALLOC_DESC= Use Perl malloc
+PERL_64BITINT_DESC= Use 64 bit integers (on i386)
+PTHREAD_DESC= Build with -pthread
+MULTIPLICITY_DESC= Use multiplicity
+SITECUSTOMIZE_DESC= Run-time customization of @INC
+USE_PERL_DESC= Rewrite links in /usr/bin
PORTSCOUT= limitw:1,even
@@ -86,7 +84,7 @@
PERL_ARCH=${PERL_ARCH} \
SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
-.if defined(WITH_DEBUGGING)
+.if ${PORT_OPTIONS:MDEBUGGING}
CONFIGURE_ARGS+= -Doptimize="-g" -DDEBUGGING
STRIP=
STRIP_CMD= ${TRUE}
@@ -94,7 +92,7 @@
CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
.endif
-.if defined(WITH_GDBM)
+.if ${PORT_OPTIONS:MGDBM}
CONFIGURE_ARGS+= -Di_gdbm
LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm
PLIST_SUB+= GDBM=""
@@ -109,13 +107,13 @@
PLIST_SUB+= MANCONF="@comment "
.endif
-.if defined(WITHOUT_PERL_MALLOC)
-.undef WITH_PERL_MALLOC
-.else
-WITH_PERL_MALLOC= yes
-.endif
+#.if !${PORT_OPTIONS:MPERL_MALLOC}
+#.undef WITH_PERL_MALLOC
+#.else
+#WITH_PERL_MALLOC= yes
+#.endif
-.if defined(WITH_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
#XXX .if ${ARCH} == "amd64"
#XXX IGNORE= Threaded perl does not pass tests on ${ARCH}
#XXX .endif
@@ -123,30 +121,31 @@
PKGNAMESUFFIX= -threaded
WITH_PTHREAD= yes
# it seems perl malloc has problems with threaded perl on FreeBSD
-.undef WITH_PERL_MALLOC
+#.undef WITH_PERL_MALLOC
+OPTIONS_UNSET+= PERL_MALLOC
.else
CONFIGURE_ARGS+= -Dusethreads=n
.endif
-.if defined(WITH_PERL_MALLOC)
+.if ${PORT_OPTIONS:MPERL_MALLOC}
CONFIGURE_ARGS+= -Dusemymalloc=y
.else
CONFIGURE_ARGS+= -Dusemymalloc=n
.endif
-.if defined(WITH_PERL_64BITINT)
+.if ${PORT_OPTIONS:MPERL_64BITINT}
CONFIGURE_ARGS+= -Duse64bitint
.endif
-.if defined(WITH_MULTIPLICITY)
+.if ${PORT_OPTIONS:MMULTIPLICITY}
CONFIGURE_ARGS+= -Dusemultiplicity=y
.endif
-.if defined(WITH_SITECUSTOMIZE)
+.if ${PORT_OPTIONS:MSITECUSTOMIZE}
CONFIGURE_ARGS+= -Dusesitecustomize
.endif
-.if defined(WITH_USE_PERL)
+.if ${PORT_OPTIONS:MUSE_PERL}
LINK_USRBIN= yes
.else
LINK_USRBIN= no
@@ -154,7 +153,7 @@
NO_LATEST_LINK= yes
-.if defined(WITH_GDBM)
+.if ${PORT_OPTIONS:MGDBM}
MAN3+= GDBM_File.3
.endif
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}/perl
@@ -192,7 +191,7 @@
${BSDPAN_WRKSRC}/ExtUtils/*.pm
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
-.if defined(WITH_PTHREAD)
+.if ${PORT_OPTIONS:MPTHREAD}
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \
-e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \
${WRKSRC}/hints/freebsd.sh
--- /usr/ports/lang/perl5.14/Makefile 2012-11-17 14:58:54.000000000 +0900
+++ lang/perl5.14/Makefile 2013-02-12 12:28:04.000000000 +0900
@@ -1,7 +1,4 @@
-# New ports collection makefile for: perl5
-# Date created: 16 April 1995
-# Whom: markm
-#
+# Created by: markm
# $FreeBSD: ports/lang/perl5.14/Makefile,v 1.143 2012/11/17 05:58:54 svnexp Exp $
#
@@ -28,15 +25,16 @@
perl-5.10.* perl-threaded-5.10.* \
perl-5.12.* perl-threaded-5.12.*
-OPTIONS= DEBUGGING "Build with debugging support" off \
- GDBM "Build GDBM_File extension" off \
- PERL_MALLOC "Use Perl malloc" off \
- PERL_64BITINT "Use 64 bit integers (on i386)" on \
- THREADS "Build threaded perl" off \
- PTHREAD "Build with -pthread" on \
- MULTIPLICITY "Use multiplicity" off \
- SITECUSTOMIZE "Run-time customization of @INC" off \
- USE_PERL "Rewrite links in /usr/bin" on
+OPTIONS_DEFINE= DEBUGGING GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD\
+ MULTIPLICITY SITECUSTOMIZE USE_PERL
+OPTIONS_DEFAULT=PERL_64BITINT PTHREAD USE_PERL
+DEBUGGING_DESC= Build with debugging support
+PERL_MALLOC_DESC= Use Perl malloc
+PERL_64BITINT_DESC= Use 64 bit integers (on i386)
+PTHREAD_DESC= Build with -pthread
+MULTIPLICITY_DESC= Use multiplicity
+SITECUSTOMIZE_DESC= Run-time customization of @INC
+USE_PERL_DESC= Rewrite links in /usr/bin
PORTSCOUT= limitw:1,even
@@ -85,7 +83,7 @@
PERL_ARCH=${PERL_ARCH} \
SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
-.if defined(WITH_DEBUGGING)
+.if ${PORT_OPTIONS:MDEBUGGING}
CONFIGURE_ARGS+= -Doptimize="-g" -DDEBUGGING
STRIP=
STRIP_CMD= ${TRUE}
@@ -93,7 +91,7 @@
CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
.endif
-.if defined(WITH_GDBM)
+.if ${PORT_OPTIONS:MGDBM}
CONFIGURE_ARGS+= -Di_gdbm
LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm
PLIST_SUB+= GDBM=""
@@ -108,13 +106,13 @@
PLIST_SUB+= MANCONF="@comment "
.endif
-.if defined(WITHOUT_PERL_MALLOC)
-.undef WITH_PERL_MALLOC
-.else
-WITH_PERL_MALLOC= yes
-.endif
+#.if !${PORT_OPTIONS:MPERL_MALLOC}
+#.undef WITH_PERL_MALLOC
+#.else
+#WITH_PERL_MALLOC= yes
+#.endif
-.if defined(WITH_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
#XXX .if ${ARCH} == "amd64"
#XXX IGNORE= Threaded perl does not pass tests on ${ARCH}
#XXX .endif
@@ -122,30 +120,31 @@
PKGNAMESUFFIX= -threaded
WITH_PTHREAD= yes
# it seems perl malloc has problems with threaded perl on FreeBSD
-.undef WITH_PERL_MALLOC
+#.undef WITH_PERL_MALLOC
+OPTIONS_UNSET+= PERL_MALLOC
.else
CONFIGURE_ARGS+= -Dusethreads=n
.endif
-.if defined(WITH_PERL_MALLOC)
+.if ${PORT_OPTIONS:MPERL_MALLOC}
CONFIGURE_ARGS+= -Dusemymalloc=y
.else
CONFIGURE_ARGS+= -Dusemymalloc=n
.endif
-.if defined(WITH_PERL_64BITINT)
+.if ${PORT_OPTIONS:MPERL_64BITINT}
CONFIGURE_ARGS+= -Duse64bitint
.endif
-.if defined(WITH_MULTIPLICITY)
+.if ${PORT_OPTIONS:MMULTIPLICITY}
CONFIGURE_ARGS+= -Dusemultiplicity=y
.endif
-.if defined(WITH_SITECUSTOMIZE)
+.if ${PORT_OPTIONS:MSITECUSTOMIZE}
CONFIGURE_ARGS+= -Dusesitecustomize
.endif
-.if defined(WITH_USE_PERL)
+.if ${PORT_OPTIONS:MUSE_PERL}
LINK_USRBIN= yes
.else
LINK_USRBIN= no
@@ -153,7 +152,7 @@
LATEST_LINK= perl
-.if defined(WITH_GDBM)
+.if ${PORT_OPTIONS:MGDBM}
MAN3+= GDBM_File.3
.endif
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}/perl
@@ -191,7 +190,7 @@
${BSDPAN_WRKSRC}/ExtUtils/*.pm
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
-.if defined(WITH_PTHREAD)
+.if ${PORT_OPTIONS:MPTHREAD}
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \
-e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \
${WRKSRC}/hints/freebsd.sh
--- /usr/ports/lang/perl5.16/Makefile 2012-11-17 14:58:54.000000000 +0900
+++ lang/perl5.16/Makefile 2013-02-12 12:28:08.000000000 +0900
@@ -1,7 +1,4 @@
-# New ports collection makefile for: perl5
-# Date created: 16 April 1995
-# Whom: markm
-#
+# Created by: markm
# $FreeBSD: ports/lang/perl5.16/Makefile,v 1.144 2012/11/17 05:58:54 svnexp Exp $
#
@@ -28,15 +25,16 @@
perl-5.12.* perl-threaded-5.12.* \
perl-5.14.* perl-threaded-5.14.*
-OPTIONS= DEBUGGING "Build with debugging support" off \
- GDBM "Build GDBM_File extension" off \
- PERL_MALLOC "Use Perl malloc" off \
- PERL_64BITINT "Use 64 bit integers (on i386)" on \
- THREADS "Build threaded perl" off \
- PTHREAD "Build with -pthread" on \
- MULTIPLICITY "Use multiplicity" off \
- SITECUSTOMIZE "Run-time customization of @INC" off \
- USE_PERL "Rewrite links in /usr/bin" on
+OPTIONS_DEFINE= DEBUGGING GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD\
+ MULTIPLICITY SITECUSTOMIZE USE_PERL
+OPTIONS_DEFAULT=PERL_64BITINT PTHREAD USE_PERL
+DEBUGGING_DESC= Build with debugging support
+PERL_MALLOC_DESC= Use Perl malloc
+PERL_64BITINT_DESC= Use 64 bit integers (on i386)
+PTHREAD_DESC= Build with -pthread
+MULTIPLICITY_DESC= Use multiplicity
+SITECUSTOMIZE_DESC= Run-time customization of @INC
+USE_PERL_DESC= Rewrite links in /usr/bin
PORTSCOUT= limitw:1,even
@@ -85,7 +83,7 @@
PERL_ARCH=${PERL_ARCH} \
SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
-.if defined(WITH_DEBUGGING)
+.if ${PORT_OPTIONS:MDEBUGGING}
CONFIGURE_ARGS+= -Doptimize="-g" -DDEBUGGING
STRIP=
STRIP_CMD= ${TRUE}
@@ -93,7 +91,7 @@
CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
.endif
-.if defined(WITH_GDBM)
+.if ${PORT_OPTIONS:MGDBM}
CONFIGURE_ARGS+= -Di_gdbm
LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm
PLIST_SUB+= GDBM=""
@@ -108,13 +106,13 @@
PLIST_SUB+= MANCONF="@comment "
.endif
-.if defined(WITHOUT_PERL_MALLOC)
-.undef WITH_PERL_MALLOC
-.else
-WITH_PERL_MALLOC= yes
-.endif
+#.if !${PORT_OPTIONS:MPERL_MALLOC}
+#.undef WITH_PERL_MALLOC
+#.else
+#WITH_PERL_MALLOC= yes
+#.endif
-.if defined(WITH_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
#XXX .if ${ARCH} == "amd64"
#XXX IGNORE= Threaded perl does not pass tests on ${ARCH}
#XXX .endif
@@ -122,30 +120,31 @@
PKGNAMESUFFIX= -threaded
WITH_PTHREAD= yes
# it seems perl malloc has problems with threaded perl on FreeBSD
-.undef WITH_PERL_MALLOC
+#.undef WITH_PERL_MALLOC
+OPTIONS_UNSET+= PERL_MALLOC
.else
CONFIGURE_ARGS+= -Dusethreads=n
.endif
-.if defined(WITH_PERL_MALLOC)
+.if ${PORT_OPTIONS:MPERL_MALLOC}
CONFIGURE_ARGS+= -Dusemymalloc=y
.else
CONFIGURE_ARGS+= -Dusemymalloc=n
.endif
-.if defined(WITH_PERL_64BITINT)
+.if ${PORT_OPTIONS:MPERL_64BITINT}
CONFIGURE_ARGS+= -Duse64bitint
.endif
-.if defined(WITH_MULTIPLICITY)
+.if ${PORT_OPTIONS:MMULTIPLICITY}
CONFIGURE_ARGS+= -Dusemultiplicity=y
.endif
-.if defined(WITH_SITECUSTOMIZE)
+.if ${PORT_OPTIONS:MSITECUSTOMIZE}
CONFIGURE_ARGS+= -Dusesitecustomize
.endif
-.if defined(WITH_USE_PERL)
+.if ${PORT_OPTIONS:MUSE_PERL}
LINK_USRBIN= yes
.else
LINK_USRBIN= no
@@ -153,7 +152,7 @@
NO_LATEST_LINK= yes
-.if defined(WITH_GDBM)
+.if ${PORT_OPTIONS:MGDBM}
MAN3+= GDBM_File.3
.endif
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}/perl
@@ -191,7 +190,7 @@
${BSDPAN_WRKSRC}/ExtUtils/*.pm
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
-.if defined(WITH_PTHREAD)
+.if ${PORT_OPTIONS:MPTHREAD}
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \
-e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \
${WRKSRC}/hints/freebsd.sh
--- perl.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5119F0E6.4050102>