From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 10 17:10:21 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4864B37B407 for ; Tue, 10 Jun 2003 17:10:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FEE543FF2 for ; Tue, 10 Jun 2003 17:10:12 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5B0ACUp056672 for ; Tue, 10 Jun 2003 17:10:12 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5B0ACFw056671; Tue, 10 Jun 2003 17:10:12 -0700 (PDT) Resent-Date: Tue, 10 Jun 2003 17:10:12 -0700 (PDT) Resent-Message-Id: <200306110010.h5B0ACFw056671@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sergei Kolobov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E898837B405 for ; Tue, 10 Jun 2003 17:05:57 -0700 (PDT) Received: from outpost.globcon.net (outpost.globcon.net [62.141.88.161]) by mx1.FreeBSD.org (Postfix) with SMTP id F1C9343FBD for ; Tue, 10 Jun 2003 17:05:54 -0700 (PDT) (envelope-from sgk@kolobov.com) Received: (qmail 99001 invoked from network); 11 Jun 2003 00:05:32 -0000 Received: from h166.lukarcos.com (HELO kolobov.com) (62.141.88.166) by outpost.globcon.net with SMTP; 11 Jun 2003 00:05:32 -0000 Received: (qmail 22098 invoked by uid 911); 10 Jun 2003 22:59:18 -0000 Message-Id: <20030610225918.22097.qmail@kolobov.com> Date: 10 Jun 2003 22:59:18 -0000 From: Sergei Kolobov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/53180: [PATCH] Update devel/makeplus to 0.2.3, take maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jun 2003 00:10:22 -0000 >Number: 53180 >Category: ports >Synopsis: [PATCH] Update devel/makeplus to 0.2.3, take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jun 10 17:10:11 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Sergei Kolobov >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD elf.chetwood.ru 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Jun 5 02:19:41 MSD >Description: In memory of AlanE: - Update to 0.2.3 - Add dependency on textproc/xmlto (submitted separately) to create documentation - Reword/clarify COMMENT and pkg-descr - Cleanup Makefile - Use DATADIR/DOCSDIR macros in pkg-plist - Adopt this orphan Removed file: - files/patch-configure_start.sh Added file: - files/patch-main.mk >How-To-Repeat: >Fix: --- makeplus-0.2.3.patch begins here --- 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 @@ -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 +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 + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./make+ install -#EOF +.include 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 < +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%% --- makeplus-0.2.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: