Attachment #32097 for bug #53180

View | Details | Raw Unified | Return to bug 53180
Collapse All | Expand All

Lines 1-5 Link Here

(-)makeplus/Makefile (-18 / +17 lines)
1	# ex:ts=8 --mode: makefile--
2	#
3	# New ports collection makefile for: makeplus	1	# New ports collection makefile for: makeplus
4	# Date created: 2002-12-22	2	# Date created: 2002-12-22
5	# Whom: Alan Eldridge <alane@geeksrus.net>	3	# Whom: Alan Eldridge <alane@geeksrus.net>
Lines 8-39 Link Here
8	#	6	#
9		7
10	PORTNAME= makeplus	8	PORTNAME= makeplus
11	PORTVERSION= 0.1.2	9	PORTVERSION= 0.2.3
12	PORTREVISION= 1
13	PORTEPOCH= 0
14	CATEGORIES= devel	10	CATEGORIES= devel
15	MASTER_SITES= http://www.annexia.org/freeware/${PORTNAME}/	11	MASTER_SITES= http://www.annexia.org/freeware/${PORTNAME}/
16		12
17	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= sergei@kolobov.com
18	COMMENT= A set of GNU Make rules for building packages with gmake	14	COMMENT= Advanced build system for GNU Make
		15
		16	BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto
19		17
20	USE_GMAKE= yes	18	USE_GMAKE= yes
21	PREFIX?= ${LOCALBASE}	19	USE_REINPLACE= yes
22	MAKE_ENV+= MAKEPLUS_HOME=${WRKSRC}	20	HAS_CONFIGURE= yes
23	NO_MTREE= yes	21	MAKEPLUS_HOME= ${WRKSRC}
		22	CONFIGURE_ENV= PATH=${MAKEPLUS_HOME}:${PATH} MAKEPLUS_HOME=${MAKEPLUS_HOME}
		23	CONFIGURE_ARGS= --prefix=${PREFIX}
		24	MAKE_ENV= MAKEPLUS_HOME=${MAKEPLUS_HOME}
24		25
25	MAN1= make+.1	26	MAN1= make+.1
26		27
27	.include <bsd.port.pre.mk>	28	post-patch:
		29	${REINPLACE_CMD} -e 's/xmlto/xmlto --skip-validation/' \
		30	${WRKSRC}/Makefile+
28		31
29	do-build:	32	do-build:
30	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./make+ \	33	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./make+
31	prefix=${PREFIX} manprefix=${PREFIX}
32		34
33	do-install:	35	do-install:
34	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \	36	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./make+ install
35	./make+ install prefix=${PREFIX} manprefix=${PREFIX}
36
37	.include <bsd.port.post.mk>
38		37
39	#EOF	38	.include <bsd.port.mk>

Line 1 Link Here

(-)makeplus/distinfo (-1 / +1 lines)
1	MD5 (makeplus-0.1.2.tar.gz) = a8778da81bcd712d9e6fe3fa5cf63c44	1	MD5 (makeplus-0.2.3.tar.gz) = 84255f16e4435190a446406a85304ebd




--- 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
+




--- 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




Make+ is a set of scripts which enhance GNU make. 
author.

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




bin/make+
bin/make+-skeleton
etc/make+.conf
%%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%%

Return to bug 53180

Lines 1-73 Link Here

(-)makeplus/files/patch-configure_start.sh (-73 lines)
1	--- configure_start.sh.orig Sat Feb 8 05:00:52 2003
2	+++ configure_start.sh Mon Feb 10 18:30:53 2003
3	@@ -28,33 +28,41 @@
4	#define VERSION "$VERSION"
5	EOF
6
7	+case `uname` in
8	+ *BSD)
9	+ manprefix="\$(prefix)";;
10	+ *)
11	+ manprefix="\$(datadir)";;
12	+esac
13	+
14	cat > config.mk <<EOF
15	prefix = $prefix
16	-bindir = $bindir
17	-sbindir = $sbindir
18	-libexecdir = $libexecdir
19	-datadir = $datadir
20	-sysconfdir = $sysconfdir
21	-sharedstatedir = $sharedstatedir
22	-localstatedir = $localstatedir
23	-libdir = $libdir
24	-infodir = $infodir
25	-includedir = $includedir
26	-pkgdatadir = $pkgdatadir
27	-docdir = $docdir
28	-pkgetcdir = $pkgetcdir
29	-pkglibdir = $pkglibdir
30	-pkgincludedir = $pkgincludedir
31	-manprefix = $datadir
32	-mandir = $mandir
33	-man1dir = $man1dir
34	-man2dir = $man2dir
35	-man3dir = $man3dir
36	-man4dir = $man4dir
37	-man5dir = $man5dir
38	-man6dir = $man6dir
39	-man7dir = $man7dir
40	-man8dir = $man8dir
41	-manndir = $manndir
42	-manldir = $manldir
43	-EOF
44	\ No newline at end of file
45	+bindir = \$(prefix)/bin
46	+sbindir = \$(prefix)/sbin
47	+libexecdir = \$(prefix)/libexec
48	+datadir = \$(prefix)/share
49	+sysconfdir = \$(prefix)/etc
50	+sharedstatedir = \$(prefix)/com
51	+localstatedir = \$(prefix)/var
52	+libdir = \$(prefix)/lib
53	+infodir = \$(prefix)/info
54	+includedir = \$(prefix)/include
55	+pkgdatadir = \$(datadir)/$PACKAGE
56	+docdir = \$(datadir)/doc/$PACKAGE
57	+pkgetcdir = \$(sysconfdir)/$PACKAGE
58	+pkglibdir = \$(libdir)/$PACKAGE
59	+pkgincludedir = \$(includedir)/$PACKAGE
60	+manprefix = $manprefix
61	+mandir = \$(manprefix)/man
62	+man1dir = \$(mandir)/man1
63	+man2dir = \$(mandir)/man2
64	+man3dir = \$(mandir)/man3
65	+man4dir = \$(mandir)/man4
66	+man5dir = \$(mandir)/man5
67	+man6dir = \$(mandir)/man6
68	+man7dir = \$(mandir)/man7
69	+man8dir = \$(mandir)/man8
70	+manndir = \$(mandir)/mann
71	+manldir = \$(mandir)/manl
72	+EOF
73	+

Line 0 Link Here

(-)makeplus/files/patch-main.mk (+18 lines)
	1	--- main.mk.orig Thu Jun 5 15:22:24 2003
	2	+++ main.mk Thu Jun 5 15:24:04 2003
	3	@@ -33,13 +33,14 @@
	4	infodir = $(prefix)/info
	5	includedir = $(prefix)/include
	6	pkgdatadir = $(datadir)/$(PACKAGE)
	7	-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
	8	pkgetcdir = $(sysconfdir)/$(PACKAGE)
	9	pkglibdir = $(libdir)/$(PACKAGE)
	10	pkgincludedir = $(includedir)/$(PACKAGE)
	11	ifneq ($(shell uname), FreeBSD)
	12	+docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
	13	manprefix = $(datadir)
	14	else
	15	+docdir = $(datadir)/doc/$(PACKAGE)
	16	manprefix = $(prefix)
	17	endif
	18	mandir = $(manprefix)/man

Lines 1-6 Link Here

(-)makeplus/pkg-descr (-3 / +8 lines)
1	Make+ is a set of GNU Make rules for building the other packages from this	1	Make+ is a set of scripts which enhance GNU make.
2	author.
3		2
4	WWW: http://www.annexia.org/freeware/	3	The scripts replace the functionality of autoconf, automake, rpm,
		4	dpkg and more, allowing you to build, install, make RPMs,
		5	make Debian packages and more, all from a single maintainable
		6	'Makefile+' script.
		7
		8	Author: Richard W.M. Jones <rich@annexia.org>
		9	WWW: http://www.annexia.org/freeware/makeplus/
5		10
6	-- AlanE@FreeBSD.org	11	-- AlanE@FreeBSD.org

Lines 1-32 Link Here

(-)makeplus/pkg-plist (-29 / +36 lines)
1	bin/make+	1	bin/make+
2	bin/make+-skeleton	2	bin/make+-skeleton
3	etc/make+.conf	3	etc/make+.conf
4	share/doc/makeplus-0.1.2/README	4	%%PORTDOCS%%%%DOCSDIR%%/README
5	share/doc/makeplus-0.1.2/ch01.html	5	%%PORTDOCS%%%%DOCSDIR%%/ch01.html
6	share/doc/makeplus-0.1.2/ch02.html	6	%%PORTDOCS%%%%DOCSDIR%%/ch02.html
7	share/doc/makeplus-0.1.2/ch03.html	7	%%PORTDOCS%%%%DOCSDIR%%/ch03.html
8	share/doc/makeplus-0.1.2/ch04.html	8	%%PORTDOCS%%%%DOCSDIR%%/ch03s02.html
9	share/doc/makeplus-0.1.2/index.html	9	%%PORTDOCS%%%%DOCSDIR%%/ch03s03.html
10	share/makeplus/c.mk	10	%%PORTDOCS%%%%DOCSDIR%%/ch04.html
11	share/makeplus/check_funcs.sh	11	%%PORTDOCS%%%%DOCSDIR%%/index.html
12	share/makeplus/check_headers.sh	12	%%PORTDOCS%%@dirrm %%DOCSDIR%%
13	share/makeplus/check_lib.sh	13	%%DATADIR%%/README.make+_for_bundles
14	share/makeplus/configure.mk	14	%%DATADIR%%/c.mk
15	share/makeplus/configure_end.sh	15	%%DATADIR%%/check_funcs.sh
16	share/makeplus/configure_start.sh	16	%%DATADIR%%/check_gnu_tar.sh
17	share/makeplus/default_goal.mk	17	%%DATADIR%%/check_headers.sh
18	share/makeplus/dist.mk	18	%%DATADIR%%/check_lib.sh
19	share/makeplus/install_dynamic_lib.sh	19	%%DATADIR%%/check_progs.sh
20	share/makeplus/install_static_lib.sh	20	%%DATADIR%%/configure
21	share/makeplus/link_dynamic.sh	21	%%DATADIR%%/configure.mk
22	share/makeplus/link_static.sh	22	%%DATADIR%%/configure_end.sh
23	share/makeplus/main.mk	23	%%DATADIR%%/configure_start.sh
24	share/makeplus/make+	24	%%DATADIR%%/default_goal.mk
25	share/makeplus/make_rpm_spec.sh	25	%%DATADIR%%/dist.mk
26	share/makeplus/make_website.sh	26	%%DATADIR%%/install_dynamic_lib.sh
27	share/makeplus/rpm.mk	27	%%DATADIR%%/install_static_lib.sh
28	share/makeplus/run_tests.sh	28	%%DATADIR%%/link_dynamic.sh
29	share/makeplus/test.mk	29	%%DATADIR%%/link_static.sh
30	share/makeplus/website.mk	30	%%DATADIR%%/main.mk
31	@dirrm share/makeplus	31	%%DATADIR%%/make_rpm_spec.sh
32	@dirrm share/doc/makeplus-0.1.2	32	%%DATADIR%%/make_website.sh
		33	%%DATADIR%%/makeplus.tar.gz
		34	%%DATADIR%%/release.sh
		35	%%DATADIR%%/rpm.mk
		36	%%DATADIR%%/run_tests.sh
		37	%%DATADIR%%/test.mk
		38	%%DATADIR%%/website.mk
		39	@dirrm %%DATADIR%%