PERL_LEVEL conditional dependencies
Sergey Matveychuk
sem at FreeBSD.org
Fri Aug 13 01:43:37 PDT 2004
Oliver Eikemeier wrote:
> We always test such changes with a pointyhat (former bento) run. Trivial
> changes sometimes have a big impact...
You can see an attached patch for imaging what modifications to ports
should be done.
--
Sem.
-------------- next part --------------
Index: audio/mp3riot/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/mp3riot/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- audio/mp3riot/Makefile 6 Feb 2004 13:10:48 -0000 1.2
+++ audio/mp3riot/Makefile 13 Aug 2004 08:30:44 -0000
@@ -17,6 +17,7 @@
NO_BUILD= yes
USE_ZIP= yes
+USE_PERL5= yes
NO_WRKSUBDIR= yes
PORTDOCS= example.unix groupfile CHANGELOG MANUAL mp3table.sql README repl.dat TODO utf.dat
Index: chinese/metalist/Makefile
===================================================================
RCS file: /home/pcvs/ports/chinese/metalist/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- chinese/metalist/Makefile 6 Mar 2004 06:04:04 -0000 1.12
+++ chinese/metalist/Makefile 13 Aug 2004 08:30:52 -0000
@@ -27,6 +27,8 @@
${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
+USE_PERL5= yes
+
.if defined(WITH_OURNET)
CONFIGURE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--default
MAKE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--default
Index: databases/mysql-editor/Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/mysql-editor/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- databases/mysql-editor/Makefile 7 Nov 2003 09:12:47 -0000 1.4
+++ databases/mysql-editor/Makefile 13 Aug 2004 08:30:54 -0000
@@ -17,6 +17,8 @@
RUN_DEPENDS= ${CGI_BIN}:${PORTSDIR}/${APACHE_PORT}
+USE_PERL5= yes
+
NO_BUILD= True
CGI_BIN= ${LOCALBASE}/www/cgi-bin
Index: devel/p5-Config-Auto/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-Config-Auto/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- devel/p5-Config-Auto/Makefile 1 Jun 2004 12:32:29 -0000 1.6
+++ devel/p5-Config-Auto/Makefile 13 Aug 2004 08:31:03 -0000
@@ -17,6 +17,8 @@
BUILD_DEPENDS= ${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles
RUN_DEPENDS= ${BUILD_DEPENDS}
+USE_PERL5= yes
+
OPTIONS= XMLSIMPLE "Support for XML config files" off
.include <bsd.port.pre.mk>
Index: devel/p5-PCSC-Card/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-PCSC-Card/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- devel/p5-PCSC-Card/Makefile 22 Jan 2004 21:43:58 -0000 1.2
+++ devel/p5-PCSC-Card/Makefile 13 Aug 2004 08:31:03 -0000
@@ -17,6 +17,8 @@
LIB_DEPENDS= pcsclite.0:${PORTSDIR}/devel/pcsc-lite
+USE_PERL5= yes
+
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
Index: devel/p5-SDL/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-SDL/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- devel/p5-SDL/Makefile 19 May 2004 22:12:14 -0000 1.14
+++ devel/p5-SDL/Makefile 13 Aug 2004 08:31:04 -0000
@@ -17,6 +17,7 @@
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
+USE_PERL5= yes
USE_SDL= sdl
.include <bsd.port.pre.mk>
@@ -50,7 +51,6 @@
RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
.endif
-USE_PERL5= yes
INSTALLS_SHLIB= yes
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
Index: devel/subversion-perl/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/subversion-perl/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- devel/subversion-perl/Makefile 16 Mar 2004 16:34:51 -0000 1.1
+++ devel/subversion-perl/Makefile 13 Aug 2004 08:31:05 -0000
@@ -14,6 +14,7 @@
PKGDIR= ${.CURDIR}
PLIST= ${MASTERDIR}/pkg-plist
+USE_PERL5= yes
WITH_PERL= yes
.include "${MASTERDIR}/Makefile"
Index: editors/vim5/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/vim5/Makefile,v
retrieving revision 1.128
diff -u -r1.128 Makefile
--- editors/vim5/Makefile 15 Feb 2004 22:03:07 -0000 1.128
+++ editors/vim5/Makefile 13 Aug 2004 08:31:12 -0000
@@ -24,9 +24,9 @@
.if defined(PACKAGE_BUILDING) && !defined(LITE)
BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80
LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80
-USE_PERL5= yes
.endif
+USE_PERL5= yes
LATEST_LINK?= vim5
DIST_SUBDIR= vim
WRKSRC= ${WRKDIR}/${DISTNAME}/src
Index: french/plgrenouille/Makefile
===================================================================
RCS file: /home/pcvs/ports/french/plgrenouille/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- french/plgrenouille/Makefile 12 Jun 2004 06:52:03 -0000 1.10
+++ french/plgrenouille/Makefile 13 Aug 2004 08:31:13 -0000
@@ -18,6 +18,8 @@
RUN_DEPENDS= ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+USE_PERL5= yes
+
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
RUN_DEPENDS+= ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP3
@@ -30,7 +32,6 @@
.endif
NO_BUILD= yes
-USE_PERL5= yes
USE_REINPLACE= yes
USE_RC_SUBR= yes
SCRIPTS_ENV= PKG_PREFIX=${PREFIX}
Index: graphics/gd/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/gd/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- graphics/gd/Makefile 26 May 2004 07:36:24 -0000 1.69
+++ graphics/gd/Makefile 13 Aug 2004 08:31:22 -0000
@@ -26,6 +26,11 @@
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)
@@ -44,11 +49,6 @@
.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::
Index: irc/xchat-gnome/Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/xchat-gnome/Makefile,v
retrieving revision 1.138
diff -u -r1.138 Makefile
--- irc/xchat-gnome/Makefile 26 Jul 2004 16:35:15 -0000 1.138
+++ irc/xchat-gnome/Makefile 13 Aug 2004 08:31:28 -0000
@@ -23,6 +23,7 @@
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}"
@@ -66,8 +67,8 @@
.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
Index: irc/xchat2/Makefile
===================================================================
RCS file: /home/pcvs/ports/irc/xchat2/Makefile,v
retrieving revision 1.137
diff -u -r1.137 Makefile
--- irc/xchat2/Makefile 8 Jul 2004 19:00:09 -0000 1.137
+++ irc/xchat2/Makefile 13 Aug 2004 08:31:28 -0000
@@ -21,6 +21,7 @@
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 \
@@ -62,8 +63,8 @@
.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
Index: japanese/wikicker/Makefile
===================================================================
RCS file: /home/pcvs/ports/japanese/wikicker/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- japanese/wikicker/Makefile 7 Jun 2004 19:52:34 -0000 1.7
+++ japanese/wikicker/Makefile 13 Aug 2004 08:31:33 -0000
@@ -34,6 +34,8 @@
${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl
+USE_PERL5= yes
+
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
Index: korean/baekmukfonts-bdf/Makefile
===================================================================
RCS file: /home/pcvs/ports/korean/baekmukfonts-bdf/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- korean/baekmukfonts-bdf/Makefile 23 Jul 2004 19:10:14 -0000 1.22
+++ korean/baekmukfonts-bdf/Makefile 13 Aug 2004 08:31:34 -0000
@@ -25,6 +25,7 @@
RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
USE_X_PREFIX= yes
+USE_PERL5_BUILD=yes
FONTLIST= batang10 batang10b batang12 batang12b batang14 batang14b \
batang16 batang16b batang18 batang18b batang20 batang20b \
@@ -42,7 +43,6 @@
FONTSDIR= lib/X11/fonts/local
MAKE_ENV= FONTSDIR=${FONTSDIR}
PLIST_SUB= FONTSDIR=${FONTSDIR}
-USE_PERL5_BUILD=yes
# manually install hinted fonts
do-configure:
Index: lang/pike76/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/pike76/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- lang/pike76/Makefile 15 Jun 2004 11:40:01 -0000 1.11
+++ lang/pike76/Makefile 13 Aug 2004 08:31:35 -0000
@@ -75,6 +75,7 @@
--without-machine-code \
--prefix=${PREFIX}
+USE_PERL5= yes
USE_REINPLACE= yes
USE_GETTEXT= yes
USE_BISON= yes
@@ -95,9 +96,9 @@
# 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)
Index: mail/mailscanner/files/patch-lib:clamav-wrapper
===================================================================
RCS file: /home/pcvs/ports/mail/mailscanner/files/patch-lib:clamav-wrapper,v
retrieving revision 1.4
diff -u -r1.4 patch-lib:clamav-wrapper
--- mail/mailscanner/files/patch-lib:clamav-wrapper 8 Aug 2004 17:16:18 -0000 1.4
+++ mail/mailscanner/files/patch-lib:clamav-wrapper 13 Aug 2004 08:31:37 -0000
@@ -1,4 +1,8 @@
+<<<<<<< patch-lib:clamav-wrapper
+$FreeBSD: ports/mail/mailscanner-devel/files/patch-lib:clamav-wrapper,v 1.1 2004/03/02 17:29:42 glewis Exp $
+=======
$FreeBSD: ports/mail/mailscanner/files/patch-lib:clamav-wrapper,v 1.4 2004/08/08 17:16:18 sem Exp $
+>>>>>>> 1.4
--- ../MailScanner-4.27.5.orig/lib/clamav-wrapper Thu Feb 26 15:25:51 2004
+++ lib/clamav-wrapper Thu Feb 26 15:26:23 2004
Index: mail/openwebmail/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/openwebmail/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- mail/openwebmail/Makefile 12 Aug 2004 16:56:40 -0000 1.46
+++ mail/openwebmail/Makefile 13 Aug 2004 08:31:38 -0000
@@ -17,6 +17,8 @@
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+USE_PERL5= yes
+
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500802
@@ -25,7 +27,6 @@
${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
.endif
-USE_PERL5= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
OWCGIDIR?= ${PREFIX}/www/cgi-bin/openwebmail
Index: mail/pronto/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/pronto/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- mail/pronto/Makefile 17 May 2004 10:57:58 -0000 1.9
+++ mail/pronto/Makefile 13 Aug 2004 08:31:39 -0000
@@ -35,6 +35,8 @@
RUN_DEPENDS= ${BUILD_DEPENDS}
+USE_PERL5= yes
+
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
Index: mail/qmail-ldap/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/qmail-ldap/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- mail/qmail-ldap/Makefile 13 Apr 2004 23:26:09 -0000 1.33
+++ mail/qmail-ldap/Makefile 13 Aug 2004 08:31:39 -0000
@@ -20,6 +20,7 @@
MAINTAINER= lioux at FreeBSD.org
COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support
+USE_PERL5= yes
USE_OPENLDAP= yes
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}2
Index: mail/qmail-mysql/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/qmail-mysql/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- mail/qmail-mysql/Makefile 7 Mar 2004 21:08:27 -0000 1.11
+++ mail/qmail-mysql/Makefile 13 Aug 2004 08:31:39 -0000
@@ -19,6 +19,8 @@
LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+USE_PERL5= yes
+
# patches from the master port that brake this one are now allowed
MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER= yes
Index: mail/qmail-smtp_auth+tls/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/qmail-smtp_auth+tls/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- mail/qmail-smtp_auth+tls/Makefile 12 Mar 2004 02:28:38 -0000 1.15
+++ mail/qmail-smtp_auth+tls/Makefile 13 Aug 2004 08:31:39 -0000
@@ -20,6 +20,7 @@
ONLY_FOR_ARCHS= i386
USE_OPENSSL= YES
+USE_PERL5= YES
# Patches from the main qmail port are not wanted
MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes
Index: mail/qmail-tls/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/qmail-tls/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- mail/qmail-tls/Makefile 7 Mar 2004 21:08:27 -0000 1.14
+++ mail/qmail-tls/Makefile 13 Aug 2004 08:31:39 -0000
@@ -18,6 +18,7 @@
COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support
USE_OPENSSL= YES
+USE_PERL5= YES
# Patches from the main qmail port are not wanted
MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER= yes
Index: misc/callid/Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/callid/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- misc/callid/Makefile 17 Apr 2004 19:45:44 -0000 1.2
+++ misc/callid/Makefile 13 Aug 2004 08:31:47 -0000
@@ -16,6 +16,7 @@
USE_MYSQL= yes
USE_PHP= yes
WANT_PHP_WEB= yes
+USE_PERL5= yes
NO_BUILD= yes
Index: net/beacon/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/beacon/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- net/beacon/Makefile 11 Jul 2004 20:06:33 -0000 1.4
+++ net/beacon/Makefile 13 Aug 2004 08:31:59 -0000
@@ -16,6 +16,8 @@
BUILD_DEPENDS= ${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
RUN_DEPENDS= ${BUILD_DEPENDS}
+USE_PERL5= yes
+
WWW_DIR?= ${PREFIX}/www/
PLIST_SUB+= VERSION=${PORTVERSION}
USE_PERL5= yes
Index: net/wping/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/wping/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- net/wping/Makefile 24 Oct 2003 12:03:19 -0000 1.3
+++ net/wping/Makefile 13 Aug 2004 08:32:06 -0000
@@ -17,6 +17,7 @@
${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
USE_BZIP2= yes
+USE_PERL5= yes
NO_BUILD= yes
do-install:
Index: news/cleanfeed/Makefile
===================================================================
RCS file: /home/pcvs/ports/news/cleanfeed/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- news/cleanfeed/Makefile 11 Feb 2004 09:20:44 -0000 1.11
+++ news/cleanfeed/Makefile 13 Aug 2004 08:32:07 -0000
@@ -16,6 +16,8 @@
RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn
+USE_PERL5= yes
+
NO_BUILD= yes
BINOWN= news
BINGRP= news
Index: print/muttprint/Makefile
===================================================================
RCS file: /home/pcvs/ports/print/muttprint/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- print/muttprint/Makefile 12 Aug 2004 12:48:00 -0000 1.26
+++ print/muttprint/Makefile 13 Aug 2004 08:32:17 -0000
@@ -29,6 +29,8 @@
espgs:${PORTSDIR}/print/cups-pstoraster
.endif
+USE_PERL5= yes
+
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
Index: russian/muttprint/Makefile
===================================================================
RCS file: /home/pcvs/ports/russian/muttprint/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- russian/muttprint/Makefile 17 Nov 2003 12:03:16 -0000 1.2
+++ russian/muttprint/Makefile 13 Aug 2004 08:32:18 -0000
@@ -14,6 +14,7 @@
MASTERDIR= ${.CURDIR}/../../print/muttprint
ADD_TRANS= ${.CURDIR}/files/translation-??.pl
USE_REINPLACE= yes
+USE_PERL5= yes
pre-build:
@${REINPLACE_CMD} '/^\\\\usepackage\[T1\]{fontenc}/d' ${WRKSRC}/${PORTNAME}
Index: sysutils/munin-main/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/munin-main/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sysutils/munin-main/Makefile 14 Jun 2004 20:13:12 -0000 1.4
+++ sysutils/munin-main/Makefile 13 Aug 2004 08:32:26 -0000
@@ -21,6 +21,8 @@
${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net \
${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template
+USE_PERL5= yes
+
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} <= 500800
Index: sysutils/munin-node/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/munin-node/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- sysutils/munin-node/Makefile 14 Jun 2004 20:13:13 -0000 1.6
+++ sysutils/munin-node/Makefile 13 Aug 2004 08:32:26 -0000
@@ -19,6 +19,8 @@
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ${SITE_PERL}/Net/Server/Fork.pm:${PORTSDIR}/net/p5-Net-Server
+USE_PERL5= yes
+
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
Index: sysutils/portmanager/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/portmanager/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sysutils/portmanager/Makefile 10 Aug 2004 05:34:34 -0000 1.4
+++ sysutils/portmanager/Makefile 13 Aug 2004 08:32:26 -0000
@@ -2,11 +2,19 @@
# Date created: April 23, 2004
# Whom: Michael C. Shultz <ringworm at inbox.lv>
#
+<<<<<<< Makefile
+# $FreeBSD$
+=======
# $FreeBSD: ports/sysutils/portmanager/Makefile,v 1.4 2004/08/10 05:34:34 sem Exp $
+>>>>>>> 1.4
#
PORTNAME= portmanager
+<<<<<<< Makefile
+PORTVERSION= 0.1.6
+=======
PORTVERSION= 0.1.9
+>>>>>>> 1.4
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= portmanager
@@ -23,6 +31,36 @@
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
INSTALLS_SHLIB= yes
+<<<<<<< Makefile
+
+.if !defined(NOPORTDOCS)
+PORTDOCS= docbook.css index.html libPMGR.3.html libPMGR.h.html PMGRrDbCreate.3.html \
+ PMGRrDbCreate.c.html PMGRrDbCreate.h.html PMGRrMakeDescribe.3.html \
+ PMGRrMakeDescribe.c.html PMGRrMakeDescribe.h.html MGrCommandLine.3.html \
+ MGrCommandLine.c.html MGrCommandLine.h.html MGrDbArray.3.html \
+ MGrDbArray.c.html MGrDbArray.h.html MGrFileSize.3.html MGrFileSize.c.html \
+ MGrFileSize.h.html MGrFileTime.3.html MGrFileTime.c.html MGrFileTime.h.html \
+ MGrIfFileExist.3.html MGrIfFileExist.c.html MGrIfFileExist.h.html \
+ MGrInStringSwap.3.html MGrInStringSwap.c.html MGrInStringSwap.h.html \
+ MGrIntToString.3.html MGrIntToString.c.html MGrIntToString.h.html \
+ MGsDb.7.html MGsProperty.7.html libMG.3.html libMG.h.html mgmlParse.1.html \
+ mgmlParse.c.html mgmlParse.h.html pmCvsSup.1.html pmCvsSup.c.html \
+ pmCvsSup.h.html portmanager.1.html portmanager.c.html portmanager.h.html \
+ pmFreeBSDdoc.1.html pmFreeBSDdoc.c.html pmFreeBSDdoc.h.html pmStatus.1.html \
+ pmStatus.c.html pmStatus.h.html pmUpgrade.1.html pmUpgrade.c.html \
+ pmUpgrade.h.html setup.0.1.4
+INSTALL_TARGET= install info
+
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+BROKEN= core dumps on 5.x
+.endif
+
+.include <bsd.port.post.mk>
+=======
.if !defined(NOPORTDOCS)
PORTDOCS= docbook.css index.html libPMGR.3.html libPMGR.h.html PMGRrDbCreate.3.html \
@@ -53,3 +91,4 @@
@${ECHO} "* Michael C. Shultz ringworm at inbox.lv *"
@${ECHO} "***************************************************"
.include <bsd.port.mk>
+>>>>>>> 1.4
Index: sysutils/portmanager/distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/portmanager/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- sysutils/portmanager/distinfo 10 Aug 2004 05:34:34 -0000 1.4
+++ sysutils/portmanager/distinfo 13 Aug 2004 08:32:26 -0000
@@ -1,2 +1,7 @@
+<<<<<<< distinfo
+MD5 (portmanager-0.1.6.tar.gz) = c499626000914abdc774349c123cf712
+SIZE (portmanager-0.1.6.tar.gz) = 416742
+=======
MD5 (portmanager-0.1.9.tar.gz) = 0629f5155a1ac261017bd4e79c226118
SIZE (portmanager-0.1.9.tar.gz) = 358597
+>>>>>>> 1.4
Index: sysutils/portmanager/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/portmanager/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- sysutils/portmanager/pkg-plist 10 Aug 2004 05:34:34 -0000 1.4
+++ sysutils/portmanager/pkg-plist 13 Aug 2004 08:32:26 -0000
@@ -13,12 +13,22 @@
include/PMGRrMakeDescribe.h
include/libMG.h
include/libPMGR.h
+<<<<<<< pkg-plist
+include/pmStatus.h
+include/pmUpgrade.h
+=======
include/pmStatus.h
include/pmupgrade.h
+>>>>>>> 1.4
lib/libMG.a
lib/libMG
lib/libMG.0
lib/libPMGR.a
+<<<<<<< pkg-plist
+lib/libPMGR
+lib/libPMGR.0
+ at dirrm etc/portmanager
+=======
lib/libPMGR
lib/libPMGR.0
share/portmanager/.keepme
@@ -29,3 +39,4 @@
@unexec rm -f %D/share/portmanager/ports_old.db 2>/dev/null || true
@unexec rmdir %D/share/portmanager 2>/dev/null || true
@unexec rmdir %D/etc/portmanager 2>/dev/null || true
+>>>>>>> 1.4
Index: sysutils/stalepid/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/stalepid/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sysutils/stalepid/Makefile 6 Feb 2004 13:12:30 -0000 1.2
+++ sysutils/stalepid/Makefile 13 Aug 2004 08:32:27 -0000
@@ -14,13 +14,13 @@
MAINTAINER= roam at FreeBSD.org
COMMENT= Check for stale pid files and remove them
+USE_PERL5_RUN= yes
+
.include <bsd.port.pre.mk>
RUN_DEPENDS= ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
.if ${PERL_LEVEL} < 500600
RUN_DEPENDS+= ${SITE_PERL}/Errno.pm:${PORTSDIR}/devel/p5-Errno
.endif
-
-USE_PERL5_RUN= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
Index: textproc/sgmlformat/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/sgmlformat/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- textproc/sgmlformat/Makefile 7 May 2003 07:13:28 -0000 1.28
+++ textproc/sgmlformat/Makefile 13 Aug 2004 08:32:37 -0000
@@ -18,6 +18,8 @@
# Jade is preferred, but it currently doesn't compile on 2.1.x
# system, so use sp in that case.
+USE_PERL5_RUN= yes
+
.include <bsd.port.pre.mk>
.if ${MACHINE_ARCH} != "i386"
@@ -35,7 +37,6 @@
${PREFIX}/share/sgml/docbook:${PORTSDIR}/textproc/docbook
USE_REINPLACE= yes
-USE_PERL5_RUN= yes
MAN1= instant.1 sgmlfmt.1
MAN5= transpec.5
Index: www/p5-CGI-Cache/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/p5-CGI-Cache/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- www/p5-CGI-Cache/Makefile 16 Jan 2004 03:58:06 -0000 1.11
+++ www/p5-CGI-Cache/Makefile 13 Aug 2004 08:32:49 -0000
@@ -19,6 +19,8 @@
${SITE_PERL}/Cache/SizeAwareFileCache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+PERL_CONFIGURE= yes
+
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} <= 500600
@@ -26,8 +28,6 @@
.endif
RUN_DEPENDS= ${BUILD_DEPENDS}
-
-PERL_CONFIGURE= yes
MAN3= CGI::Cache.3
Index: www/slash/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/slash/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- www/slash/Makefile 22 Feb 2004 10:04:48 -0000 1.10
+++ www/slash/Makefile 13 Aug 2004 08:32:50 -0000
@@ -20,6 +20,8 @@
RUN_DEPENDS= ${BUILD_DEPENDS} \
${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
+USE_PERL5= yes
+
DOCS= README INSTALL
CONFLICTS= metalist
Index: x11-toolkits/p5-qt/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/p5-qt/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- x11-toolkits/p5-qt/Makefile 17 Mar 2004 03:25:28 -0000 1.1
+++ x11-toolkits/p5-qt/Makefile 13 Aug 2004 08:32:53 -0000
@@ -33,6 +33,8 @@
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= Qt.3
+USE_PERL5= yes
+
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
More information about the freebsd-perl
mailing list