Attachment 32097 Details for Bug 53180 – makeplus-0.2.3.patch

[patch] makeplus-0.2.3.patch

makeplus-0.2.3.patch (text/plain), 7.50 KB, created by Sergei Kolobov on 2003-06-11 01:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergei Kolobov

Created: 2003-06-11 01:10:11 UTC

Size: 7.50 KB

patch

obsolete

>diff -ruN --exclude=CVS makeplus.cvs/Makefile makeplus/Makefile
>--- makeplus.cvs/Makefile	Mon Jun  9 01:13:45 2003
>+++ makeplus/Makefile	Wed Jun 11 02:28:33 2003
>@@ -1,5 +1,3 @@
>-# ex:ts=8	-*-mode: makefile-*-
>-#
> # New ports collection makefile for:	makeplus
> # Date created:		2002-12-22
> # Whom:			Alan Eldridge <alane@geeksrus.net>
>@@ -8,32 +6,33 @@
> #
> 
> PORTNAME=	makeplus
>-PORTVERSION=	0.1.2
>-PORTREVISION=	1
>-PORTEPOCH=	0
>+PORTVERSION=	0.2.3
> CATEGORIES=	devel
> MASTER_SITES=	http://www.annexia.org/freeware/${PORTNAME}/
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	A set of GNU Make rules for building packages with gmake
>+MAINTAINER=	sergei@kolobov.com
>+COMMENT=	Advanced build system for GNU Make
>+
>+BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
> 
> USE_GMAKE=	yes
>-PREFIX?=	${LOCALBASE}
>-MAKE_ENV+=	MAKEPLUS_HOME=${WRKSRC}
>-NO_MTREE=	yes
>+USE_REINPLACE=	yes
>+HAS_CONFIGURE=	yes
>+MAKEPLUS_HOME=	${WRKSRC}
>+CONFIGURE_ENV=	PATH=${MAKEPLUS_HOME}:${PATH} MAKEPLUS_HOME=${MAKEPLUS_HOME}
>+CONFIGURE_ARGS=	--prefix=${PREFIX}
>+MAKE_ENV=	MAKEPLUS_HOME=${MAKEPLUS_HOME}
> 
> MAN1=		make+.1
> 
>-.include <bsd.port.pre.mk>
>+post-patch:
>+	${REINPLACE_CMD} -e 's/xmlto/xmlto --skip-validation/' \
>+		${WRKSRC}/Makefile+
> 
> do-build:
>-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./make+ \
>-		prefix=${PREFIX} manprefix=${PREFIX}
>+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./make+
> 
> do-install:
>-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
>-		./make+ install prefix=${PREFIX} manprefix=${PREFIX}
>-
>-.include <bsd.port.post.mk>
>+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./make+ install
> 
>-#EOF
>+.include <bsd.port.mk>
>diff -ruN --exclude=CVS makeplus.cvs/distinfo makeplus/distinfo
>--- makeplus.cvs/distinfo	Mon Feb 10 06:06:47 2003
>+++ makeplus/distinfo	Thu Jun  5 13:10:32 2003
>@@ -1 +1 @@
>-MD5 (makeplus-0.1.2.tar.gz) = a8778da81bcd712d9e6fe3fa5cf63c44
>+MD5 (makeplus-0.2.3.tar.gz) = 84255f16e4435190a446406a85304ebd
>diff -ruN --exclude=CVS makeplus.cvs/files/patch-configure_start.sh makeplus/files/patch-configure_start.sh
>--- makeplus.cvs/files/patch-configure_start.sh	Tue Feb 11 02:46:12 2003
>+++ makeplus/files/patch-configure_start.sh	Thu Jan  1 03:00:00 1970
>@@ -1,73 +0,0 @@
>---- configure_start.sh.orig	Sat Feb  8 05:00:52 2003
>-+++ configure_start.sh	Mon Feb 10 18:30:53 2003
>-@@ -28,33 +28,41 @@
>- #define VERSION "$VERSION"
>- EOF
>- 
>-+case `uname` in 
>-+    *BSD) 
>-+	manprefix="\$(prefix)";;
>-+    *)	
>-+	manprefix="\$(datadir)";;
>-+esac
>-+
>- cat > config.mk <<EOF
>- prefix		= $prefix
>--bindir		= $bindir
>--sbindir		= $sbindir
>--libexecdir	= $libexecdir
>--datadir		= $datadir
>--sysconfdir	= $sysconfdir
>--sharedstatedir	= $sharedstatedir
>--localstatedir	= $localstatedir
>--libdir		= $libdir
>--infodir		= $infodir
>--includedir	= $includedir
>--pkgdatadir	= $pkgdatadir
>--docdir		= $docdir
>--pkgetcdir	= $pkgetcdir
>--pkglibdir	= $pkglibdir
>--pkgincludedir	= $pkgincludedir
>--manprefix	= $datadir
>--mandir		= $mandir
>--man1dir		= $man1dir
>--man2dir		= $man2dir
>--man3dir		= $man3dir
>--man4dir		= $man4dir
>--man5dir		= $man5dir
>--man6dir		= $man6dir
>--man7dir		= $man7dir
>--man8dir		= $man8dir
>--manndir		= $manndir
>--manldir		= $manldir
>--EOF
>-\ No newline at end of file
>-+bindir		= \$(prefix)/bin
>-+sbindir		= \$(prefix)/sbin
>-+libexecdir	= \$(prefix)/libexec
>-+datadir		= \$(prefix)/share
>-+sysconfdir	= \$(prefix)/etc
>-+sharedstatedir	= \$(prefix)/com
>-+localstatedir	= \$(prefix)/var
>-+libdir		= \$(prefix)/lib
>-+infodir		= \$(prefix)/info
>-+includedir	= \$(prefix)/include
>-+pkgdatadir	= \$(datadir)/$PACKAGE
>-+docdir		= \$(datadir)/doc/$PACKAGE
>-+pkgetcdir	= \$(sysconfdir)/$PACKAGE
>-+pkglibdir	= \$(libdir)/$PACKAGE
>-+pkgincludedir	= \$(includedir)/$PACKAGE
>-+manprefix	= $manprefix
>-+mandir		= \$(manprefix)/man
>-+man1dir		= \$(mandir)/man1
>-+man2dir		= \$(mandir)/man2
>-+man3dir		= \$(mandir)/man3
>-+man4dir		= \$(mandir)/man4
>-+man5dir		= \$(mandir)/man5
>-+man6dir		= \$(mandir)/man6
>-+man7dir		= \$(mandir)/man7
>-+man8dir		= \$(mandir)/man8
>-+manndir		= \$(mandir)/mann
>-+manldir		= \$(mandir)/manl
>-+EOF
>-+
>diff -ruN --exclude=CVS makeplus.cvs/files/patch-main.mk makeplus/files/patch-main.mk
>--- makeplus.cvs/files/patch-main.mk	Thu Jan  1 03:00:00 1970
>+++ makeplus/files/patch-main.mk	Thu Jun  5 15:25:25 2003
>@@ -0,0 +1,18 @@
>+--- main.mk.orig	Thu Jun  5 15:22:24 2003
>++++ main.mk	Thu Jun  5 15:24:04 2003
>+@@ -33,13 +33,14 @@
>+ infodir		= $(prefix)/info
>+ includedir	= $(prefix)/include
>+ pkgdatadir	= $(datadir)/$(PACKAGE)
>+-docdir		= $(datadir)/doc/$(PACKAGE)-$(VERSION)
>+ pkgetcdir	= $(sysconfdir)/$(PACKAGE)
>+ pkglibdir	= $(libdir)/$(PACKAGE)
>+ pkgincludedir	= $(includedir)/$(PACKAGE)
>+ ifneq ($(shell uname), FreeBSD)
>++docdir		= $(datadir)/doc/$(PACKAGE)-$(VERSION)
>+ manprefix	= $(datadir)
>+ else
>++docdir		= $(datadir)/doc/$(PACKAGE)
>+ manprefix	= $(prefix)
>+ endif
>+ mandir		= $(manprefix)/man
>diff -ruN --exclude=CVS makeplus.cvs/pkg-descr makeplus/pkg-descr
>--- makeplus.cvs/pkg-descr	Mon Feb 10 06:06:47 2003
>+++ makeplus/pkg-descr	Wed Jun 11 02:25:29 2003
>@@ -1,6 +1,11 @@
>-Make+ is a set of GNU Make rules for building the other packages from this
>-author.
>+Make+ is a set of scripts which enhance GNU make. 
> 
>-WWW: http://www.annexia.org/freeware/
>+The scripts replace the functionality of autoconf, automake, rpm, 
>+dpkg and more, allowing you to build, install, make RPMs, 
>+make Debian packages and more, all from a single maintainable 
>+'Makefile+' script. 
>+
>+Author:	Richard W.M. Jones <rich@annexia.org>
>+WWW:	http://www.annexia.org/freeware/makeplus/
> 
> -- AlanE@FreeBSD.org
>diff -ruN --exclude=CVS makeplus.cvs/pkg-plist makeplus/pkg-plist
>--- makeplus.cvs/pkg-plist	Mon Feb 10 06:06:47 2003
>+++ makeplus/pkg-plist	Wed Jun 11 02:40:34 2003
>@@ -1,32 +1,39 @@
> bin/make+
> bin/make+-skeleton
> etc/make+.conf
>-share/doc/makeplus-0.1.2/README
>-share/doc/makeplus-0.1.2/ch01.html
>-share/doc/makeplus-0.1.2/ch02.html
>-share/doc/makeplus-0.1.2/ch03.html
>-share/doc/makeplus-0.1.2/ch04.html
>-share/doc/makeplus-0.1.2/index.html
>-share/makeplus/c.mk
>-share/makeplus/check_funcs.sh
>-share/makeplus/check_headers.sh
>-share/makeplus/check_lib.sh
>-share/makeplus/configure.mk
>-share/makeplus/configure_end.sh
>-share/makeplus/configure_start.sh
>-share/makeplus/default_goal.mk
>-share/makeplus/dist.mk
>-share/makeplus/install_dynamic_lib.sh
>-share/makeplus/install_static_lib.sh
>-share/makeplus/link_dynamic.sh
>-share/makeplus/link_static.sh
>-share/makeplus/main.mk
>-share/makeplus/make+
>-share/makeplus/make_rpm_spec.sh
>-share/makeplus/make_website.sh
>-share/makeplus/rpm.mk
>-share/makeplus/run_tests.sh
>-share/makeplus/test.mk
>-share/makeplus/website.mk
>-@dirrm share/makeplus
>-@dirrm share/doc/makeplus-0.1.2
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch02.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch03.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch03s02.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch03s03.html
>+%%PORTDOCS%%%%DOCSDIR%%/ch04.html
>+%%PORTDOCS%%%%DOCSDIR%%/index.html
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+%%DATADIR%%/README.make+_for_bundles
>+%%DATADIR%%/c.mk
>+%%DATADIR%%/check_funcs.sh
>+%%DATADIR%%/check_gnu_tar.sh
>+%%DATADIR%%/check_headers.sh
>+%%DATADIR%%/check_lib.sh
>+%%DATADIR%%/check_progs.sh
>+%%DATADIR%%/configure
>+%%DATADIR%%/configure.mk
>+%%DATADIR%%/configure_end.sh
>+%%DATADIR%%/configure_start.sh
>+%%DATADIR%%/default_goal.mk
>+%%DATADIR%%/dist.mk
>+%%DATADIR%%/install_dynamic_lib.sh
>+%%DATADIR%%/install_static_lib.sh
>+%%DATADIR%%/link_dynamic.sh
>+%%DATADIR%%/link_static.sh
>+%%DATADIR%%/main.mk
>+%%DATADIR%%/make_rpm_spec.sh
>+%%DATADIR%%/make_website.sh
>+%%DATADIR%%/makeplus.tar.gz
>+%%DATADIR%%/release.sh
>+%%DATADIR%%/rpm.mk
>+%%DATADIR%%/run_tests.sh
>+%%DATADIR%%/test.mk
>+%%DATADIR%%/website.mk
>+@dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 53180: 32097