Attachment #34093 for bug #55515

Lines 17-22 Link Here

(-)audio/mp3riot/Makefile (+1 lines)
17		17
18	NO_BUILD= yes	18	NO_BUILD= yes
19	USE_ZIP= yes	19	USE_ZIP= yes
		20	USE_PERL5= yes
20	NO_WRKSUBDIR= yes	21	NO_WRKSUBDIR= yes
21		22
22	PORTDOCS= example.unix groupfile CHANGELOG MANUAL mp3table.sql README repl.dat TODO utf.dat	23	PORTDOCS= example.unix groupfile CHANGELOG MANUAL mp3table.sql README repl.dat TODO utf.dat

Lines 27-32 Link Here

(-)chinese/metalist/Makefile (+2 lines)
27	${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple	27	${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple
28	RUN_DEPENDS= ${BUILD_DEPENDS}	28	RUN_DEPENDS= ${BUILD_DEPENDS}
29		29
		30	USE_PERL5= yes
		31
30	.if defined(WITH_OURNET)	32	.if defined(WITH_OURNET)
31	CONFIGURE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--default	33	CONFIGURE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--default
32	MAKE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--default	34	MAKE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--default

Lines 17-22 Link Here

(-)databases/mysql-editor/Makefile (+2 lines)
17		17
18	RUN_DEPENDS= ${CGI_BIN}:${PORTSDIR}/${APACHE_PORT}	18	RUN_DEPENDS= ${CGI_BIN}:${PORTSDIR}/${APACHE_PORT}
19		19
		20	USE_PERL5= yes
		21
20	NO_BUILD= True	22	NO_BUILD= True
21		23
22	CGI_BIN= ${LOCALBASE}/www/cgi-bin	24	CGI_BIN= ${LOCALBASE}/www/cgi-bin

Lines 17-22 Link Here

(-)devel/p5-Config-Auto/Makefile (+2 lines)
17	BUILD_DEPENDS= ${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles	17	BUILD_DEPENDS= ${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles
18	RUN_DEPENDS= ${BUILD_DEPENDS}	18	RUN_DEPENDS= ${BUILD_DEPENDS}
19		19
		20	USE_PERL5= yes
		21
20	OPTIONS= XMLSIMPLE "Support for XML config files" off	22	OPTIONS= XMLSIMPLE "Support for XML config files" off
21		23
22	.include <bsd.port.pre.mk>	24	.include <bsd.port.pre.mk>

Lines 17-22 Link Here

(-)devel/p5-PCSC-Card/Makefile (+2 lines)
17		17
18	LIB_DEPENDS= pcsclite.0:${PORTSDIR}/devel/pcsc-lite	18	LIB_DEPENDS= pcsclite.0:${PORTSDIR}/devel/pcsc-lite
19		19
		20	USE_PERL5= yes
		21
20	.include <bsd.port.pre.mk>	22	.include <bsd.port.pre.mk>
21		23
22	.if ${PERL_LEVEL} < 500600	24	.if ${PERL_LEVEL} < 500600

Lines 17-22 Link Here

(-)devel/p5-SDL/Makefile (-1 / +1 lines)
17	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \	17	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
18	jpeg.9:${PORTSDIR}/graphics/jpeg	18	jpeg.9:${PORTSDIR}/graphics/jpeg
19		19
		20	USE_PERL5= yes
20	USE_SDL= sdl	21	USE_SDL= sdl
21		22
22	.include <bsd.port.pre.mk>	23	.include <bsd.port.pre.mk>
Lines 50-56 Link Here
50	RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple	51	RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
51	.endif	52	.endif
52		53
53	USE_PERL5= yes
54	INSTALLS_SHLIB= yes	54	INSTALLS_SHLIB= yes
55		55
56	MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}	56	MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}

Lines 14-19 Link Here

(-)devel/subversion-perl/Makefile (+1 lines)
14	PKGDIR= ${.CURDIR}	14	PKGDIR= ${.CURDIR}
15	PLIST= ${MASTERDIR}/pkg-plist	15	PLIST= ${MASTERDIR}/pkg-plist
16		16
		17	USE_PERL5= yes
17	WITH_PERL= yes	18	WITH_PERL= yes
18		19
19	.include "${MASTERDIR}/Makefile"	20	.include "${MASTERDIR}/Makefile"

Lines 24-32 Link Here

(-)editors/vim5/Makefile (-1 / +1 lines)
24	.if defined(PACKAGE_BUILDING) && !defined(LITE)	24	.if defined(PACKAGE_BUILDING) && !defined(LITE)
25	BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80	25	BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80
26	LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80	26	LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80
27	USE_PERL5= yes
28	.endif	27	.endif
29		28
		29	USE_PERL5= yes
30	LATEST_LINK?= vim5	30	LATEST_LINK?= vim5
31	DIST_SUBDIR= vim	31	DIST_SUBDIR= vim
32	WRKSRC= ${WRKDIR}/${DISTNAME}/src	32	WRKSRC= ${WRKDIR}/${DISTNAME}/src

Lines 18-23 Link Here

(-)french/plgrenouille/Makefile (-1 / +2 lines)
18	RUN_DEPENDS= ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \	18	RUN_DEPENDS= ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
19	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes	19	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
20		20
		21	USE_PERL5= yes
		22
21	.include <bsd.port.pre.mk>	23	.include <bsd.port.pre.mk>
22	.if ${PERL_LEVEL} < 500600	24	.if ${PERL_LEVEL} < 500600
23	RUN_DEPENDS+= ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP3	25	RUN_DEPENDS+= ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP3
Lines 30-36 Link Here
30	.endif	32	.endif
31		33
32	NO_BUILD= yes	34	NO_BUILD= yes
33	USE_PERL5= yes
34	USE_REINPLACE= yes	35	USE_REINPLACE= yes
35	USE_RC_SUBR= yes	36	USE_RC_SUBR= yes
36	SCRIPTS_ENV= PKG_PREFIX=${PREFIX}	37	SCRIPTS_ENV= PKG_PREFIX=${PREFIX}




INSTALLS_SHLIB=	yes
SCRIPTDIR=	${FILESDIR}

.if defined(GD_FONTS)
USE_PERL5_BUILD=yes
SCRIPTS_ENV+=	GD_FONTS="${GD_FONTS}"
.endif

.include <bsd.port.pre.mk>

.if defined(WITH_XPM)

.if defined(WITH_LZW) || defined(HAVE_UNISYS_LICENSE) || \
    (defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES")
CPPFLAGS+=	-DLZW_LICENSED
.endif

.if defined(GD_FONTS)
USE_PERL5_BUILD=	yes
SCRIPTS_ENV+=	GD_FONTS="${GD_FONTS}"
.endif

pre-everything::




USE_GMAKE=	yes
USE_GNOME=	gnomeprefix gnomehack libgnomeui
USE_REINPLACE=	yes
USE_PERL5=	yes
USE_LIBTOOL_VER=15
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"

.if ${ARCH} == "amd64" || ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL)
CONFIGURE_ARGS+=--disable-perl
PLIST_SUB+=	PERL="@comment "
.undef USE_PERL5
.else
USE_PERL5=	yes
CONFIGURE_ARGS+=--enable-perl
PLIST_SUB+=	PERL=""
.endif




USE_GNOME=	gnomeprefix gnomehack gtk20
GNU_CONFIGURE=	yes
USE_REINPLACE=	yes
USE_PERL5=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS=	--enable-nls \

.if ${ARCH} == "amd64" || ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL)
CONFIGURE_ARGS+=--disable-perl
PLIST_SUB+=	PERL="@comment "
.undef USE_PERL5
.else
USE_PERL5=	yes
CONFIGURE_ARGS+=--enable-perl
PLIST_SUB+=	PERL=""
.endif

Lines 34-39 Link Here

(-)japanese/wikicker/Makefile (+2 lines)
34	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \	34	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
35	${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl	35	${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl
36		36
		37	USE_PERL5= yes
		38
37	.include <bsd.port.pre.mk>	39	.include <bsd.port.pre.mk>
38		40
39	.if ${PERL_LEVEL} < 500800	41	.if ${PERL_LEVEL} < 500800

Lines 25-30 Link Here

(-)korean/baekmukfonts-bdf/Makefile (-1 / +1 lines)
25	RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}	25	RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
26		26
27	USE_X_PREFIX= yes	27	USE_X_PREFIX= yes
		28	USE_PERL5_BUILD=yes
28		29
29	FONTLIST= batang10 batang10b batang12 batang12b batang14 batang14b \	30	FONTLIST= batang10 batang10b batang12 batang12b batang14 batang14b \
30	batang16 batang16b batang18 batang18b batang20 batang20b \	31	batang16 batang16b batang18 batang18b batang20 batang20b \
Lines 42-48 Link Here
42	FONTSDIR= lib/X11/fonts/local	43	FONTSDIR= lib/X11/fonts/local
43	MAKE_ENV= FONTSDIR=${FONTSDIR}	44	MAKE_ENV= FONTSDIR=${FONTSDIR}
44	PLIST_SUB= FONTSDIR=${FONTSDIR}	45	PLIST_SUB= FONTSDIR=${FONTSDIR}
45	USE_PERL5_BUILD=yes
46		46
47	# manually install hinted fonts	47	# manually install hinted fonts
48	do-configure:	48	do-configure:




		 --without-machine-code \
		 --prefix=${PREFIX}

USE_PERL5=	yes
USE_REINPLACE=	yes
USE_GETTEXT=	yes
USE_BISON=	yes

# Allow building Embeded perl when >= 5.6
.if ${PERL_LEVEL} > 500600
CONFIGURE_ARGS+=	--with-perl
USE_PERL5=	YES
.else
CONFIGURE_ARGS+=	--without-perl
.undef USE_PERL5
.endif

.if defined(WITHOUT_RELOCATABLE_DUMPED_MODULES)

Lines 1-4 Link Here

(-)mail/mailscanner/files/patch-lib:clamav-wrapper (+4 lines)
		1	<<<<<<< patch-lib:clamav-wrapper
		2	$FreeBSD: ports/mail/mailscanner-devel/files/patch-lib:clamav-wrapper,v 1.1 2004/03/02 17:29:42 glewis Exp $
		3	=======
1	$FreeBSD: ports/mail/mailscanner/files/patch-lib:clamav-wrapper,v 1.4 2004/08/08 17:16:18 sem Exp $	4	$FreeBSD: ports/mail/mailscanner/files/patch-lib:clamav-wrapper,v 1.4 2004/08/08 17:16:18 sem Exp $
		5	>>>>>>> 1.4
2		6
3	--- ../MailScanner-4.27.5.orig/lib/clamav-wrapper Thu Feb 26 15:25:51 2004	7	--- ../MailScanner-4.27.5.orig/lib/clamav-wrapper Thu Feb 26 15:25:51 2004
4	+++ lib/clamav-wrapper Thu Feb 26 15:26:23 2004	8	+++ lib/clamav-wrapper Thu Feb 26 15:26:23 2004

Lines 17-22 Link Here

(-)mail/openwebmail/Makefile (-1 / +2 lines)
17	RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \	17	RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
18	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64	18	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
19		19
		20	USE_PERL5= yes
		21
20	.include <bsd.port.pre.mk>	22	.include <bsd.port.pre.mk>
21		23
22	.if ${PERL_LEVEL} < 500802	24	.if ${PERL_LEVEL} < 500802
Lines 25-31 Link Here
25	${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net	27	${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
26	.endif	28	.endif
27		29
28	USE_PERL5= yes
29	NO_BUILD= yes	30	NO_BUILD= yes
30	NO_WRKSUBDIR= yes	31	NO_WRKSUBDIR= yes
31	OWCGIDIR?= ${PREFIX}/www/cgi-bin/openwebmail	32	OWCGIDIR?= ${PREFIX}/www/cgi-bin/openwebmail

Lines 35-40 Link Here

(-)mail/pronto/Makefile (+2 lines)
35		35
36	RUN_DEPENDS= ${BUILD_DEPENDS}	36	RUN_DEPENDS= ${BUILD_DEPENDS}
37		37
		38	USE_PERL5= yes
		39
38	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
39		41
40	.if ${PERL_LEVEL} < 500600	42	.if ${PERL_LEVEL} < 500600

Lines 20-25 Link Here

(-)mail/qmail-ldap/Makefile (+1 lines)
20	MAINTAINER= lioux@FreeBSD.org	20	MAINTAINER= lioux@FreeBSD.org
21	COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support	21	COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support
22		22
		23	USE_PERL5= yes
23	USE_OPENLDAP= yes	24	USE_OPENLDAP= yes
24	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}2	25	PKGNAMESUFFIX:= ${PKGNAMESUFFIX}2
25		26

Lines 19-24 Link Here

(-)mail/qmail-mysql/Makefile (+2 lines)
19		19
20	LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client	20	LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
21		21
		22	USE_PERL5= yes
		23
22	# patches from the master port that brake this one are now allowed	24	# patches from the master port that brake this one are now allowed
23	MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER= yes	25	MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER= yes
24		26

Lines 20-25 Link Here

(-)mail/qmail-smtp_auth+tls/Makefile (+1 lines)
20	ONLY_FOR_ARCHS= i386	20	ONLY_FOR_ARCHS= i386
21		21
22	USE_OPENSSL= YES	22	USE_OPENSSL= YES
		23	USE_PERL5= YES
23		24
24	# Patches from the main qmail port are not wanted	25	# Patches from the main qmail port are not wanted
25	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes	26	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes

Lines 18-23 Link Here

(-)mail/qmail-tls/Makefile (+1 lines)
18	COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support	18	COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support
19		19
20	USE_OPENSSL= YES	20	USE_OPENSSL= YES
		21	USE_PERL5= YES
21		22
22	# Patches from the main qmail port are not wanted	23	# Patches from the main qmail port are not wanted
23	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes	24	MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes

Lines 16-21 Link Here

(-)misc/callid/Makefile (+1 lines)
16	USE_MYSQL= yes	16	USE_MYSQL= yes
17	USE_PHP= yes	17	USE_PHP= yes
18	WANT_PHP_WEB= yes	18	WANT_PHP_WEB= yes
		19	USE_PERL5= yes
19		20
20	NO_BUILD= yes	21	NO_BUILD= yes
21		22

Lines 16-21 Link Here

(-)net/beacon/Makefile (+2 lines)
16	BUILD_DEPENDS= ${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net	16	BUILD_DEPENDS= ${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
17	RUN_DEPENDS= ${BUILD_DEPENDS}	17	RUN_DEPENDS= ${BUILD_DEPENDS}
18		18
		19	USE_PERL5= yes
		20
19	WWW_DIR?= ${PREFIX}/www/	21	WWW_DIR?= ${PREFIX}/www/
20	PLIST_SUB+= VERSION=${PORTVERSION}	22	PLIST_SUB+= VERSION=${PORTVERSION}
21	USE_PERL5= yes	23	USE_PERL5= yes

Lines 17-22 Link Here

(-)net/wping/Makefile (+1 lines)
17	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes	17	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
18		18
19	USE_BZIP2= yes	19	USE_BZIP2= yes
		20	USE_PERL5= yes
20	NO_BUILD= yes	21	NO_BUILD= yes
21		22
22	do-install:	23	do-install:

Lines 16-21 Link Here

(-)news/cleanfeed/Makefile (+2 lines)
16		16
17	RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn	17	RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn
18		18
		19	USE_PERL5= yes
		20
19	NO_BUILD= yes	21	NO_BUILD= yes
20	BINOWN= news	22	BINOWN= news
21	BINGRP= news	23	BINGRP= news

Lines 29-34 Link Here

(-)print/muttprint/Makefile (+2 lines)
29	espgs:${PORTSDIR}/print/cups-pstoraster	29	espgs:${PORTSDIR}/print/cups-pstoraster
30	.endif	30	.endif
31		31
		32	USE_PERL5= yes
		33
32	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
33		35
34	.if ${PERL_LEVEL} < 500800	36	.if ${PERL_LEVEL} < 500800

Lines 14-19 Link Here

(-)russian/muttprint/Makefile (+1 lines)
14	MASTERDIR= ${.CURDIR}/../../print/muttprint	14	MASTERDIR= ${.CURDIR}/../../print/muttprint
15	ADD_TRANS= ${.CURDIR}/files/translation-??.pl	15	ADD_TRANS= ${.CURDIR}/files/translation-??.pl
16	USE_REINPLACE= yes	16	USE_REINPLACE= yes
		17	USE_PERL5= yes
17		18
18	pre-build:	19	pre-build:
19	@${REINPLACE_CMD} '/^\\\\usepackage\[T1\]{fontenc}/d' ${WRKSRC}/${PORTNAME}	20	@${REINPLACE_CMD} '/^\\\\usepackage\[T1\]{fontenc}/d' ${WRKSRC}/${PORTNAME}

Lines 21-26 Link Here

(-)sysutils/munin-main/Makefile (+2 lines)
21	${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net \	21	${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net \
22	${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template	22	${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template
23		23
		24	USE_PERL5= yes
		25
24	.include <bsd.port.pre.mk>	26	.include <bsd.port.pre.mk>
25		27
26	.if ${PERL_LEVEL} <= 500800	28	.if ${PERL_LEVEL} <= 500800

Lines 19-24 Link Here

(-)sysutils/munin-node/Makefile (+2 lines)
19	BUILD_DEPENDS= ${RUN_DEPENDS}	19	BUILD_DEPENDS= ${RUN_DEPENDS}
20	RUN_DEPENDS= ${SITE_PERL}/Net/Server/Fork.pm:${PORTSDIR}/net/p5-Net-Server	20	RUN_DEPENDS= ${SITE_PERL}/Net/Server/Fork.pm:${PORTSDIR}/net/p5-Net-Server
21		21
		22	USE_PERL5= yes
		23
22	.include <bsd.port.pre.mk>	24	.include <bsd.port.pre.mk>
23		25
24	.if ${PERL_LEVEL} < 500800	26	.if ${PERL_LEVEL} < 500800

Lines 2-12 Link Here

(-)sysutils/portmanager/Makefile (+39 lines)
2	# Date created: April 23, 2004	2	# Date created: April 23, 2004
3	# Whom: Michael C. Shultz <ringworm@inbox.lv>	3	# Whom: Michael C. Shultz <ringworm@inbox.lv>
4	#	4	#
		5	<<<<<<< Makefile
		6	# $FreeBSD$
		7	=======
5	# $FreeBSD: ports/sysutils/portmanager/Makefile,v 1.4 2004/08/10 05:34:34 sem Exp $	8	# $FreeBSD: ports/sysutils/portmanager/Makefile,v 1.4 2004/08/10 05:34:34 sem Exp $
		9	>>>>>>> 1.4
6	#	10	#
7		11
8	PORTNAME= portmanager	12	PORTNAME= portmanager
		13	<<<<<<< Makefile
		14	PORTVERSION= 0.1.6
		15	=======
9	PORTVERSION= 0.1.9	16	PORTVERSION= 0.1.9
		17	>>>>>>> 1.4
10	CATEGORIES= sysutils	18	CATEGORIES= sysutils
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	19	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= portmanager	20	MASTER_SITE_SUBDIR= portmanager
Lines 23-28 Link Here
23	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
24	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}	32	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
25	INSTALLS_SHLIB= yes	33	INSTALLS_SHLIB= yes
		34	<<<<<<< Makefile
		35
		36	.if !defined(NOPORTDOCS)
		37	PORTDOCS= docbook.css index.html libPMGR.3.html libPMGR.h.html PMGRrDbCreate.3.html \
		38	PMGRrDbCreate.c.html PMGRrDbCreate.h.html PMGRrMakeDescribe.3.html \
		39	PMGRrMakeDescribe.c.html PMGRrMakeDescribe.h.html MGrCommandLine.3.html \
		40	MGrCommandLine.c.html MGrCommandLine.h.html MGrDbArray.3.html \
		41	MGrDbArray.c.html MGrDbArray.h.html MGrFileSize.3.html MGrFileSize.c.html \
		42	MGrFileSize.h.html MGrFileTime.3.html MGrFileTime.c.html MGrFileTime.h.html \
		43	MGrIfFileExist.3.html MGrIfFileExist.c.html MGrIfFileExist.h.html \
		44	MGrInStringSwap.3.html MGrInStringSwap.c.html MGrInStringSwap.h.html \
		45	MGrIntToString.3.html MGrIntToString.c.html MGrIntToString.h.html \
		46	MGsDb.7.html MGsProperty.7.html libMG.3.html libMG.h.html mgmlParse.1.html \
		47	mgmlParse.c.html mgmlParse.h.html pmCvsSup.1.html pmCvsSup.c.html \
		48	pmCvsSup.h.html portmanager.1.html portmanager.c.html portmanager.h.html \
		49	pmFreeBSDdoc.1.html pmFreeBSDdoc.c.html pmFreeBSDdoc.h.html pmStatus.1.html \
		50	pmStatus.c.html pmStatus.h.html pmUpgrade.1.html pmUpgrade.c.html \
		51	pmUpgrade.h.html setup.0.1.4
		52	INSTALL_TARGET= install info
		53
		54	.endif
		55
		56	.include <bsd.port.pre.mk>
		57
		58	.if ${OSVERSION} >= 500000
		59	BROKEN= core dumps on 5.x
		60	.endif
		61
		62	.include <bsd.port.post.mk>
		63	=======
26		64
27	.if !defined(NOPORTDOCS)	65	.if !defined(NOPORTDOCS)
28	PORTDOCS= docbook.css index.html libPMGR.3.html libPMGR.h.html PMGRrDbCreate.3.html \	66	PORTDOCS= docbook.css index.html libPMGR.3.html libPMGR.h.html PMGRrDbCreate.3.html \
Lines 53-55 Link Here
53	@${ECHO} "* Michael C. Shultz ringworm@inbox.lv *"	91	@${ECHO} "* Michael C. Shultz ringworm@inbox.lv *"
54	@${ECHO} "***************************************************"	92	@${ECHO} "***************************************************"
55	.include <bsd.port.mk>	93	.include <bsd.port.mk>
		94	>>>>>>> 1.4

Lines 1-2 Link Here

(-)sysutils/portmanager/distinfo (+5 lines)
		1	<<<<<<< distinfo
		2	MD5 (portmanager-0.1.6.tar.gz) = c499626000914abdc774349c123cf712
		3	SIZE (portmanager-0.1.6.tar.gz) = 416742
		4	=======
1	MD5 (portmanager-0.1.9.tar.gz) = 0629f5155a1ac261017bd4e79c226118	5	MD5 (portmanager-0.1.9.tar.gz) = 0629f5155a1ac261017bd4e79c226118
2	SIZE (portmanager-0.1.9.tar.gz) = 358597	6	SIZE (portmanager-0.1.9.tar.gz) = 358597
		7	>>>>>>> 1.4

Lines 13-24 Link Here

(-)sysutils/portmanager/pkg-plist (+11 lines)
13	include/PMGRrMakeDescribe.h	13	include/PMGRrMakeDescribe.h
14	include/libMG.h	14	include/libMG.h
15	include/libPMGR.h	15	include/libPMGR.h
		16	<<<<<<< pkg-plist
		17	include/pmStatus.h
		18	include/pmUpgrade.h
		19	=======
16	include/pmStatus.h	20	include/pmStatus.h
17	include/pmupgrade.h	21	include/pmupgrade.h
		22	>>>>>>> 1.4
18	lib/libMG.a	23	lib/libMG.a
19	lib/libMG	24	lib/libMG
20	lib/libMG.0	25	lib/libMG.0
21	lib/libPMGR.a	26	lib/libPMGR.a
		27	<<<<<<< pkg-plist
		28	lib/libPMGR
		29	lib/libPMGR.0
		30	@dirrm etc/portmanager
		31	=======
22	lib/libPMGR	32	lib/libPMGR
23	lib/libPMGR.0	33	lib/libPMGR.0
24	share/portmanager/.keepme	34	share/portmanager/.keepme
Lines 29-31 Link Here
29	@unexec rm -f %D/share/portmanager/ports_old.db 2>/dev/null \|\| true	39	@unexec rm -f %D/share/portmanager/ports_old.db 2>/dev/null \|\| true
30	@unexec rmdir %D/share/portmanager 2>/dev/null \|\| true	40	@unexec rmdir %D/share/portmanager 2>/dev/null \|\| true
31	@unexec rmdir %D/etc/portmanager 2>/dev/null \|\| true	41	@unexec rmdir %D/etc/portmanager 2>/dev/null \|\| true
		42	>>>>>>> 1.4

Lines 14-26 Link Here

(-)sysutils/stalepid/Makefile (-2 / +2 lines)
14	MAINTAINER= roam@FreeBSD.org	14	MAINTAINER= roam@FreeBSD.org
15	COMMENT= Check for stale pid files and remove them	15	COMMENT= Check for stale pid files and remove them
16		16
		17	USE_PERL5_RUN= yes
		18
17	.include <bsd.port.pre.mk>	19	.include <bsd.port.pre.mk>
18	RUN_DEPENDS= ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error	20	RUN_DEPENDS= ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
19	.if ${PERL_LEVEL} < 500600	21	.if ${PERL_LEVEL} < 500600
20	RUN_DEPENDS+= ${SITE_PERL}/Errno.pm:${PORTSDIR}/devel/p5-Errno	22	RUN_DEPENDS+= ${SITE_PERL}/Errno.pm:${PORTSDIR}/devel/p5-Errno
21	.endif	23	.endif
22
23	USE_PERL5_RUN= yes
24		24
25	WRKSRC= ${WRKDIR}/${DISTNAME}	25	WRKSRC= ${WRKDIR}/${DISTNAME}
26		26

Lines 18-23 Link Here

(-)textproc/sgmlformat/Makefile (-1 / +2 lines)
18	# Jade is preferred, but it currently doesn't compile on 2.1.x	18	# Jade is preferred, but it currently doesn't compile on 2.1.x
19	# system, so use sp in that case.	19	# system, so use sp in that case.
20		20
		21	USE_PERL5_RUN= yes
		22
21	.include <bsd.port.pre.mk>	23	.include <bsd.port.pre.mk>
22		24
23	.if ${MACHINE_ARCH} != "i386"	25	.if ${MACHINE_ARCH} != "i386"
Lines 35-41 Link Here
35	${PREFIX}/share/sgml/docbook:${PORTSDIR}/textproc/docbook	37	${PREFIX}/share/sgml/docbook:${PORTSDIR}/textproc/docbook
36		38
37	USE_REINPLACE= yes	39	USE_REINPLACE= yes
38	USE_PERL5_RUN= yes
39		40
40	MAN1= instant.1 sgmlfmt.1	41	MAN1= instant.1 sgmlfmt.1
41	MAN5= transpec.5	42	MAN5= transpec.5

Lines 19-24 Link Here

(-)www/p5-CGI-Cache/Makefile (-2 / +2 lines)
19	${SITE_PERL}/Cache/SizeAwareFileCache.pm:${PORTSDIR}/devel/p5-Cache-Cache \	19	${SITE_PERL}/Cache/SizeAwareFileCache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
20	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable	20	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
21		21
		22	PERL_CONFIGURE= yes
		23
22	.include <bsd.port.pre.mk>	24	.include <bsd.port.pre.mk>
23		25
24	.if ${PERL_LEVEL} <= 500600	26	.if ${PERL_LEVEL} <= 500600
Lines 26-33 Link Here
26	.endif	28	.endif
27		29
28	RUN_DEPENDS= ${BUILD_DEPENDS}	30	RUN_DEPENDS= ${BUILD_DEPENDS}
29
30	PERL_CONFIGURE= yes
31		31
32	MAN3= CGI::Cache.3	32	MAN3= CGI::Cache.3
33		33

Lines 20-25 Link Here

(-)www/slash/Makefile (+2 lines)
20	RUN_DEPENDS= ${BUILD_DEPENDS} \	20	RUN_DEPENDS= ${BUILD_DEPENDS} \
21	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl	21	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
22		22
		23	USE_PERL5= yes
		24
23	DOCS= README INSTALL	25	DOCS= README INSTALL
24		26
25	CONFLICTS= metalist	27	CONFLICTS= metalist

Lines 33-38 Link Here

(-)x11-toolkits/p5-qt/Makefile (+2 lines)
33	MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}	33	MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
34	MAN3= Qt.3	34	MAN3= Qt.3
35		35
		36	USE_PERL5= yes
		37
36	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
37		39
38	.if ${PERL_LEVEL} < 500600	40	.if ${PERL_LEVEL} < 500600

Return to bug 55515

Lines 26-31 Link Here

(-)graphics/gd/Makefile (-5 / +5 lines)
26	INSTALLS_SHLIB= yes	26	INSTALLS_SHLIB= yes
27	SCRIPTDIR= ${FILESDIR}	27	SCRIPTDIR= ${FILESDIR}
28		28
		29	.if defined(GD_FONTS)
		30	USE_PERL5_BUILD=yes
		31	SCRIPTS_ENV+= GD_FONTS="${GD_FONTS}"
		32	.endif
		33
29	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
30		35
31	.if defined(WITH_XPM)	36	.if defined(WITH_XPM)
Lines 44-54 Link Here
44	.if defined(WITH_LZW) \|\| defined(HAVE_UNISYS_LICENSE) \|\| \	49	.if defined(WITH_LZW) \|\| defined(HAVE_UNISYS_LICENSE) \|\| \
45	(defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES")	50	(defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES")
46	CPPFLAGS+= -DLZW_LICENSED	51	CPPFLAGS+= -DLZW_LICENSED
47	.endif
48
49	.if defined(GD_FONTS)
50	USE_PERL5_BUILD= yes
51	SCRIPTS_ENV+= GD_FONTS="${GD_FONTS}"
52	.endif	52	.endif
53		53
54	pre-everything::	54	pre-everything::

Lines 23-28 Link Here

(-)irc/xchat-gnome/Makefile (-1 / +2 lines)
23	USE_GMAKE= yes	23	USE_GMAKE= yes
24	USE_GNOME= gnomeprefix gnomehack libgnomeui	24	USE_GNOME= gnomeprefix gnomehack libgnomeui
25	USE_REINPLACE= yes	25	USE_REINPLACE= yes
		26	USE_PERL5= yes
26	USE_LIBTOOL_VER=15	27	USE_LIBTOOL_VER=15
27	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \	28	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
28	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"	29	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
Lines 66-73 Link Here
66	.if ${ARCH} == "amd64" \|\| ${PERL_LEVEL} < 500600 \|\| defined(WITHOUT_PERL)	67	.if ${ARCH} == "amd64" \|\| ${PERL_LEVEL} < 500600 \|\| defined(WITHOUT_PERL)
67	CONFIGURE_ARGS+=--disable-perl	68	CONFIGURE_ARGS+=--disable-perl
68	PLIST_SUB+= PERL="@comment "	69	PLIST_SUB+= PERL="@comment "
		70	.undef USE_PERL5
69	.else	71	.else
70	USE_PERL5= yes
71	CONFIGURE_ARGS+=--enable-perl	72	CONFIGURE_ARGS+=--enable-perl
72	PLIST_SUB+= PERL=""	73	PLIST_SUB+= PERL=""
73	.endif	74	.endif

Lines 21-26 Link Here

(-)irc/xchat2/Makefile (-1 / +2 lines)
21	USE_GNOME= gnomeprefix gnomehack gtk20	21	USE_GNOME= gnomeprefix gnomehack gtk20
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23	USE_REINPLACE= yes	23	USE_REINPLACE= yes
		24	USE_PERL5= yes
24	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \	25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
25	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"	26	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
26	CONFIGURE_ARGS= --enable-nls \	27	CONFIGURE_ARGS= --enable-nls \
Lines 62-69 Link Here
62	.if ${ARCH} == "amd64" \|\| ${PERL_LEVEL} < 500600 \|\| defined(WITHOUT_PERL)	63	.if ${ARCH} == "amd64" \|\| ${PERL_LEVEL} < 500600 \|\| defined(WITHOUT_PERL)
63	CONFIGURE_ARGS+=--disable-perl	64	CONFIGURE_ARGS+=--disable-perl
64	PLIST_SUB+= PERL="@comment "	65	PLIST_SUB+= PERL="@comment "
		66	.undef USE_PERL5
65	.else	67	.else
66	USE_PERL5= yes
67	CONFIGURE_ARGS+=--enable-perl	68	CONFIGURE_ARGS+=--enable-perl
68	PLIST_SUB+= PERL=""	69	PLIST_SUB+= PERL=""
69	.endif	70	.endif

Lines 75-80 Link Here

(-)lang/pike76/Makefile (-1 / +2 lines)
75	--without-machine-code \	75	--without-machine-code \
76	--prefix=${PREFIX}	76	--prefix=${PREFIX}
77		77
		78	USE_PERL5= yes
78	USE_REINPLACE= yes	79	USE_REINPLACE= yes
79	USE_GETTEXT= yes	80	USE_GETTEXT= yes
80	USE_BISON= yes	81	USE_BISON= yes
Lines 95-103 Link Here
95	# Allow building Embeded perl when >= 5.6	96	# Allow building Embeded perl when >= 5.6
96	.if ${PERL_LEVEL} > 500600	97	.if ${PERL_LEVEL} > 500600
97	CONFIGURE_ARGS+= --with-perl	98	CONFIGURE_ARGS+= --with-perl
98	USE_PERL5= YES
99	.else	99	.else
100	CONFIGURE_ARGS+= --without-perl	100	CONFIGURE_ARGS+= --without-perl
		101	.undef USE_PERL5
101	.endif	102	.endif
102		103
103	.if defined(WITHOUT_RELOCATABLE_DUMPED_MODULES)	104	.if defined(WITHOUT_RELOCATABLE_DUMPED_MODULES)