aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/automake14/Makefile30
-rw-r--r--devel/automake14/files/patch-Makefile.in (renamed from devel/automake14/files/patch-ab)15
-rw-r--r--devel/automake14/files/patch-aclocal.in (renamed from devel/automake14/files/patch-ad)2
-rw-r--r--devel/automake14/files/patch-automake.texi (renamed from devel/automake14/files/patch-aa)0
-rw-r--r--devel/automake14/files/patch-m4-Makefile.in11
-rw-r--r--devel/automake14/pkg-plist151
6 files changed, 120 insertions, 89 deletions
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 7d2ab5b25c3f..818d24795ee9 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -7,7 +7,7 @@
PORTNAME= automake14
PORTVERSION= 1.4.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
@@ -16,32 +16,40 @@ DISTNAME= automake-1.4-p5
MAINTAINER= ports@geeksrus.net
GNU_CONFIGURE= yes
-CONFIGURE_ENV= PERL=${PERL5:C/[0-9.]//g}
-CONFIGURE_ARGS= --program-suffix=14 --datadir=${PREFIX}/share/automake14
+CONFIGURE_ENV= PERL=${PERL5} # :C/[0-9.]//g}
+CONFIGURE_ARGS= --program-suffix=14
USE_PERL5= yes
USE_REINPLACE= yes
-WRKSRC= ${WRKDIR}/${DISTNAME}
+# WRKSRC= ${WRKDIR}/${DISTNAME}
STRIP= # none
.if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
-.error You have `USE_AUTOMAKE' or `USE_AUTOMAKE_VER' variables defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
+pre-everything:
+ @${ECHO} ===========================================================
+ @${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables"
+ @${ECHO} "defined either in environment or in make(1) arguments."
+ @${ECHO} "Please undefine them and try again."
+ @${ECHO} ===========================================================
+ @${FALSE}
+.endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
post-patch:
- @-${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi
@${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake14.texi
+ @${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi >/dev/null 2>&1 || true
pre-configure:
@${REINPLACE_CMD} -i -e "s,%%X11BASE%%,${X11BASE}," \
${WRKSRC}/aclocal.in
post-install:
- @-${RM} -fr ${PREFIX}/libexec/automake14
- @${MKDIR} ${PREFIX}/libexec/automake14
+ @-${RM} -fr ${DESTDIR}${PREFIX}/libexec/automake14
+ @${MKDIR} ${DESTDIR}${PREFIX}/libexec/automake14
.for i in aclocal automake
- @${LN} -s ../../bin/${i}14 ${PREFIX}/libexec/automake14/${i}
+ @${LN} -s ../../bin/${i}14 \
+ ${DESTDIR}${PREFIX}/libexec/automake14/${i}
.endfor
- @install-info ${PREFIX}/info/automake14.info ${PREFIX}/info/dir
+ @install-info ${DESTDIR}${PREFIX}/info/automake14.info \
+ ${DESTDIR}${PREFIX}/info/dir
.include <bsd.port.mk>
diff --git a/devel/automake14/files/patch-ab b/devel/automake14/files/patch-Makefile.in
index d573e2e3ec8d..449664acee7a 100644
--- a/devel/automake14/files/patch-ab
+++ b/devel/automake14/files/patch-Makefile.in
@@ -1,5 +1,18 @@
--- Makefile.in.orig Sun Jul 15 13:23:30 2001
-+++ Makefile.in Mon Mar 18 21:47:17 2002
++++ Makefile.in Sun Oct 13 08:44:55 2002
+@@ -34,9 +34,9 @@
+
+ DESTDIR =
+
+-pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
++pkgdatadir = $(datadir)/@PACKAGE@14
++pkglibdir = $(libdir)/@PACKAGE@14
++pkgincludedir = $(includedir)/@PACKAGE@14
+
+ top_builddir = .
+
@@ -69,7 +69,7 @@
SUBDIRS = . m4 tests
diff --git a/devel/automake14/files/patch-ad b/devel/automake14/files/patch-aclocal.in
index ddf7317ff655..34596cc08909 100644
--- a/devel/automake14/files/patch-ad
+++ b/devel/automake14/files/patch-aclocal.in
@@ -1,5 +1,5 @@
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/devel/automake14/files/Attic/patch-aclocal.in,v 1.1 2002-10-13 12:54:48 alane Exp $
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
+++ aclocal.in Sat Aug 11 12:28:32 2001
diff --git a/devel/automake14/files/patch-aa b/devel/automake14/files/patch-automake.texi
index d6d5eb6a0656..d6d5eb6a0656 100644
--- a/devel/automake14/files/patch-aa
+++ b/devel/automake14/files/patch-automake.texi
diff --git a/devel/automake14/files/patch-m4-Makefile.in b/devel/automake14/files/patch-m4-Makefile.in
new file mode 100644
index 000000000000..871fa5969d1f
--- /dev/null
+++ b/devel/automake14/files/patch-m4-Makefile.in
@@ -0,0 +1,11 @@
+--- m4/Makefile.in.orig Sun Jul 15 13:23:30 2001
++++ m4/Makefile.in Sun Oct 13 08:42:46 2002
+@@ -65,7 +65,7 @@
+
+ MAINT_CHARSET = latin1
+
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(datadir)/aclocal14
+ m4data_DATA = ccstdc.m4 cond.m4 dmalloc.m4 error.m4 header.m4 init.m4 lex.m4 lispdir.m4 maintainer.m4 missing.m4 mktime.m4 multi.m4 obstack.m4 protos.m4 ptrdiff.m4 regex.m4 sanity.m4 strtod.m4 termios.m4 winsz.m4
+
+
diff --git a/devel/automake14/pkg-plist b/devel/automake14/pkg-plist
index b8b53c15a539..00506cacc6e9 100644
--- a/devel/automake14/pkg-plist
+++ b/devel/automake14/pkg-plist
@@ -5,81 +5,80 @@ info/automake14.info
@exec install-info %D/info/automake14.info %D/info/dir
libexec/automake14/aclocal
libexec/automake14/automake
-share/automake14/aclocal/ccstdc.m4
-share/automake14/aclocal/cond.m4
-share/automake14/aclocal/dmalloc.m4
-share/automake14/aclocal/error.m4
-share/automake14/aclocal/header.m4
-share/automake14/aclocal/init.m4
-share/automake14/aclocal/lex.m4
-share/automake14/aclocal/lispdir.m4
-share/automake14/aclocal/maintainer.m4
-share/automake14/aclocal/missing.m4
-share/automake14/aclocal/mktime.m4
-share/automake14/aclocal/multi.m4
-share/automake14/aclocal/obstack.m4
-share/automake14/aclocal/protos.m4
-share/automake14/aclocal/ptrdiff.m4
-share/automake14/aclocal/regex.m4
-share/automake14/aclocal/sanity.m4
-share/automake14/aclocal/strtod.m4
-share/automake14/aclocal/termios.m4
-share/automake14/aclocal/winsz.m4
-share/automake14/automake/COPYING
-share/automake14/automake/INSTALL
-share/automake14/automake/acinstall
-share/automake14/automake/ansi2knr.1
-share/automake14/automake/ansi2knr.c
-share/automake14/automake/clean-hdr.am
-share/automake14/automake/clean-kr.am
-share/automake14/automake/clean.am
-share/automake14/automake/comp-vars.am
-share/automake14/automake/compile.am
-share/automake14/automake/config.guess
-share/automake14/automake/config.sub
-share/automake14/automake/data-clean.am
-share/automake14/automake/data.am
-share/automake14/automake/dejagnu.am
-share/automake14/automake/depend.am
-share/automake14/automake/depend2.am
-share/automake14/automake/dist-vars.am
-share/automake14/automake/elisp-comp
-share/automake14/automake/footer.am
-share/automake14/automake/header-vars.am
-share/automake14/automake/header.am
-share/automake14/automake/install-sh
-share/automake14/automake/java-clean.am
-share/automake14/automake/java.am
-share/automake14/automake/kr-extra.am
-share/automake14/automake/library.am
-share/automake14/automake/libs-clean.am
-share/automake14/automake/libs.am
-share/automake14/automake/libtool.am
-share/automake14/automake/lisp-clean.am
-share/automake14/automake/lisp.am
-share/automake14/automake/ltlib-clean.am
-share/automake14/automake/ltlib.am
-share/automake14/automake/ltlibrary.am
-share/automake14/automake/mans-vars.am
-share/automake14/automake/mans.am
-share/automake14/automake/mdate-sh
-share/automake14/automake/missing
-share/automake14/automake/mkinstalldirs
-share/automake14/automake/multilib.am
-share/automake14/automake/program.am
-share/automake14/automake/progs-clean.am
-share/automake14/automake/progs.am
-share/automake14/automake/remake-hdr.am
-share/automake14/automake/remake.am
-share/automake14/automake/scripts.am
-share/automake14/automake/subdirs.am
-share/automake14/automake/tags-clean.am
-share/automake14/automake/tags.am
-share/automake14/automake/texi-vers.am
-share/automake14/automake/texinfo.tex
-share/automake14/automake/texinfos.am
-share/automake14/automake/ylwrap
+share/aclocal14/ccstdc.m4
+share/aclocal14/cond.m4
+share/aclocal14/dmalloc.m4
+share/aclocal14/error.m4
+share/aclocal14/header.m4
+share/aclocal14/init.m4
+share/aclocal14/lex.m4
+share/aclocal14/lispdir.m4
+share/aclocal14/maintainer.m4
+share/aclocal14/missing.m4
+share/aclocal14/mktime.m4
+share/aclocal14/multi.m4
+share/aclocal14/obstack.m4
+share/aclocal14/protos.m4
+share/aclocal14/ptrdiff.m4
+share/aclocal14/regex.m4
+share/aclocal14/sanity.m4
+share/aclocal14/strtod.m4
+share/aclocal14/termios.m4
+share/aclocal14/winsz.m4
+share/automake14/COPYING
+share/automake14/INSTALL
+share/automake14/acinstall
+share/automake14/ansi2knr.1
+share/automake14/ansi2knr.c
+share/automake14/clean-hdr.am
+share/automake14/clean-kr.am
+share/automake14/clean.am
+share/automake14/comp-vars.am
+share/automake14/compile.am
+share/automake14/config.guess
+share/automake14/config.sub
+share/automake14/data-clean.am
+share/automake14/data.am
+share/automake14/dejagnu.am
+share/automake14/depend.am
+share/automake14/depend2.am
+share/automake14/dist-vars.am
+share/automake14/elisp-comp
+share/automake14/footer.am
+share/automake14/header-vars.am
+share/automake14/header.am
+share/automake14/install-sh
+share/automake14/java-clean.am
+share/automake14/java.am
+share/automake14/kr-extra.am
+share/automake14/library.am
+share/automake14/libs-clean.am
+share/automake14/libs.am
+share/automake14/libtool.am
+share/automake14/lisp-clean.am
+share/automake14/lisp.am
+share/automake14/ltlib-clean.am
+share/automake14/ltlib.am
+share/automake14/ltlibrary.am
+share/automake14/mans-vars.am
+share/automake14/mans.am
+share/automake14/mdate-sh
+share/automake14/missing
+share/automake14/mkinstalldirs
+share/automake14/multilib.am
+share/automake14/program.am
+share/automake14/progs-clean.am
+share/automake14/progs.am
+share/automake14/remake-hdr.am
+share/automake14/remake.am
+share/automake14/scripts.am
+share/automake14/subdirs.am
+share/automake14/tags-clean.am
+share/automake14/tags.am
+share/automake14/texi-vers.am
+share/automake14/texinfo.tex
+share/automake14/texinfos.am
+share/automake14/ylwrap
@dirrm libexec/automake14
-@dirrm share/automake14/aclocal
-@dirrm share/automake14/automake
+@dirrm share/aclocal14
@dirrm share/automake14