Attachment 102098 Details for Bug 141793 – file.diff

[patch] file.diff

file.diff (text/plain), 5.06 KB, created by Joseph S. Atkinson on 2009-12-20 03:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph S. Atkinson

Created: 2009-12-20 03:50:00 UTC

Size: 5.06 KB

patch

obsolete

>diff -ruN /usr/ports/ports-mgmt/portmanager/Makefile portmanager/Makefile
>--- /usr/ports/ports-mgmt/portmanager/Makefile	2009-11-02 16:42:52.000000000 -0500
>+++ portmanager/Makefile	2009-12-19 22:00:41.000000000 -0500
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	portmanager
> PORTVERSION=	0.4.1
>-PORTREVISION=	9
>+PORTREVISION=	10
> CATEGORIES=	ports-mgmt
> MASTER_SITES=	SF
> 
>@@ -35,7 +35,7 @@
> 		--with-tempdir=/tmp
> 
> OPTIONS=	DEBUG "Enable debug support and warnings" off	\
>-		BUILD_DEPENDS_ARE_LEAVES "Treat build dependencies as leaves" off
>+		BLDLEAF "Treat build dependencies as leaves" off
> 
> .include <bsd.port.pre.mk>
> 
>@@ -43,7 +43,7 @@
> CONFIGURE_ARGS+=	--with-debug=yes
> .endif
> 
>-.if defined(WITH_BUILD_DEPENDS_ARE_LEAVES)
>+.if defined(WITH_BLDLEAF) || defined(WITH_BUILD_DEPENDS_ARE_LEAVES)
> CONFIGURE_ARGS+=	--with-treatBuildDependsAsLeaves=yes
> .endif
> 
>diff -ruN /usr/ports/ports-mgmt/portmanager/files/patch-portmanager__Makefile.am portmanager/files/patch-portmanager__Makefile.am
>--- /usr/ports/ports-mgmt/portmanager/files/patch-portmanager__Makefile.am	1969-12-31 19:00:00.000000000 -0500
>+++ portmanager/files/patch-portmanager__Makefile.am	2009-12-19 21:49:43.000000000 -0500
>@@ -0,0 +1,22 @@
>+--- ./portmanager/Makefile.am.orig	2009-12-19 21:48:37.000000000 -0500
>++++ ./portmanager/Makefile.am	2009-12-19 21:49:05.000000000 -0500
>+@@ -14,9 +14,7 @@
>+ EXTRA_DIST		=	\
>+ 			$(man_MANS)			\
>+ 			Makefile.am			\
>+-			bsd.port.mk-BACKUP		\
>+ 			help.txt			\
>+-			patch-bsd.port.mk-0.3.6		\
>+ 			pkgtools-to-portmanager.rb	\
>+ 			pm-020.conf.SAMPLE
>+ 
>+@@ -27,9 +25,7 @@
>+ 
>+ install-data-local:
>+ 	$(INSTALL)	-d				$(PREFIX)/share/portmanager
>+-	$(INSTALL_DATA) bsd.port.mk-BACKUP		$(PREFIX)/share/portmanager/bsd.port.mk-BACKUP
>+ 	$(INSTALL_DATA) help.txt			$(PREFIX)/share/portmanager/help.txt
>+-	$(INSTALL_DATA) patch-bsd.port.mk-0.3.6		$(PREFIX)/share/portmanager/patch-bsd.port.mk-0.3.6
>+ 	$(INSTALL_DATA) pkgtools-to-portmanager.rb	$(PREFIX)/share/portmanager/pkgtools-to-portmanager.rb
>+ 
>+ info-local:
>diff -ruN /usr/ports/ports-mgmt/portmanager/files/patch-portmanager__Makefile.in portmanager/files/patch-portmanager__Makefile.in
>--- /usr/ports/ports-mgmt/portmanager/files/patch-portmanager__Makefile.in	1969-12-31 19:00:00.000000000 -0500
>+++ portmanager/files/patch-portmanager__Makefile.in	2009-12-19 21:49:44.000000000 -0500
>@@ -0,0 +1,22 @@
>+--- ./portmanager/Makefile.in.orig	2009-12-19 21:48:44.000000000 -0500
>++++ ./portmanager/Makefile.in	2009-12-19 21:49:29.000000000 -0500
>+@@ -116,9 +116,7 @@
>+ EXTRA_DIST = \
>+ 			$(man_MANS)			\
>+ 			Makefile.am			\
>+-			bsd.port.mk-BACKUP		\
>+ 			help.txt			\
>+-			patch-bsd.port.mk-0.3.6		\
>+ 			pkgtools-to-portmanager.rb	\
>+ 			pm-020.conf.SAMPLE
>+ 
>+@@ -416,9 +414,7 @@
>+ 
>+ install-data-local:
>+ 	$(INSTALL)	-d				$(PREFIX)/share/portmanager
>+-	$(INSTALL_DATA) bsd.port.mk-BACKUP		$(PREFIX)/share/portmanager/bsd.port.mk-BACKUP
>+ 	$(INSTALL_DATA) help.txt			$(PREFIX)/share/portmanager/help.txt
>+-	$(INSTALL_DATA) patch-bsd.port.mk-0.3.6		$(PREFIX)/share/portmanager/patch-bsd.port.mk-0.3.6
>+ 	$(INSTALL_DATA) pkgtools-to-portmanager.rb	$(PREFIX)/share/portmanager/pkgtools-to-portmanager.rb
>+ 
>+ info-local:
>diff -ruN /usr/ports/ports-mgmt/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6 portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6
>--- /usr/ports/ports-mgmt/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6	2006-12-13 05:13:00.000000000 -0500
>+++ portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6	1969-12-31 19:00:00.000000000 -0500
>@@ -1,11 +0,0 @@
>---- ./portmanager/patch-bsd.port.mk-0.3.6.orig	Mon Dec 12 15:32:34 2005
>-+++ ./portmanager/patch-bsd.port.mk-0.3.6	Fri Dec  8 17:13:00 2006
>-@@ -5,7 +5,7 @@
>-  .endif
>-  .if !defined(PKG_ARGS)
>- -PKG_ARGS=		-v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
>--+PORTMANAGER=	${LOCALBASE}/bin/portmanager /${PKGORIGIN} package-depends
>-++PORTMANAGER=	${LOCALBASE}/bin/portmanager /${PKGORIGIN} package-depends | ${GREP} -v -E "^MGPMr"
>- +PKG_ARGS=		-v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${PORTMANAGER} | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
>- +###PKG_ARGS=		-v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
>-  .if !defined(NO_MTREE)
>diff -ruN /usr/ports/ports-mgmt/portmanager/pkg-plist portmanager/pkg-plist
>--- /usr/ports/ports-mgmt/portmanager/pkg-plist	2006-01-21 21:52:17.000000000 -0500
>+++ portmanager/pkg-plist	2009-12-19 21:50:40.000000000 -0500
>@@ -14,9 +14,7 @@
> @unexec rm -f %D/share/portmanager/ports_installed.db 2>/dev/null || true
> @unexec rm -f %D/share/portmanager/ports_old.db 2>/dev/null || true
> %%DATADIR%%/help.txt
>-%%DATADIR%%/patch-bsd.port.mk-0.3.6
> %%DATADIR%%/pkgtools-to-portmanager.rb
>-%%DATADIR%%/bsd.port.mk-BACKUP
> bin/portmanager
> etc/portmanager/pm-020.conf.SAMPLE
> include/libMG.h

Actions: View | Diff

Attachments on bug 141793: 102098