- Convert to staging

- pet portlint
- add license
- convert patches to makepatch naming

Sponsored by:	Absolight

5 files changed, 32 insertions, 21 deletions

diff --git a/textproc/bibtool/Makefile b/textproc/bibtool/Makefile
index d6fc051ea937..fbe706c3f63c 100644
--- a/textproc/bibtool/Makefile
+++ b/textproc/bibtool/Makefile
@@ -20,23 +20,15 @@ CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 MAKEFILE=	makefile
 INSTALL_TARGET=	install install.man
 
-MAN1=		bibtool.1
+PORTDOCS=	bibtool.dvi ref_card.dvi c_lib.dvi
 
-TXT_DOCS=	Doc/bibtool.dvi Doc/ref_card.dvi Doc/c_lib.dvi
-.if !defined(NOPORTDOCS)
-PORTDOCS=	${TXT_DOCS:S/^Doc\///}
-.endif
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+post-build:
+	cd ${WRKSRC} && ${MAKE} doc && ${MAKE} doc
 
 post-install:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${MAKE} doc && ${MAKE} doc
-	${MKDIR} ${DOCSDIR}
-	for f in ${TXT_DOCS}; do \
-	  ${INSTALL_MAN} ${WRKSRC}/$$f ${DOCSDIR}; \
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	for f in ${PORTDOCS}; do \
+	  ${INSTALL_MAN} ${WRKSRC}/Doc/$$f ${STAGEDIR}${DOCSDIR}; \
 	done
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/bibtool/files/patch-makefile.in b/textproc/bibtool/files/patch-AutoConf__makefile.in
index 9e9ac92da829..daa5be52184e 100644
--- a/textproc/bibtool/files/patch-makefile.in
+++ b/textproc/bibtool/files/patch-AutoConf__makefile.in
@@ -1,5 +1,23 @@
---- AutoConf/makefile.in.orig	Sun Feb  8 17:46:11 2004
-+++ AutoConf/makefile.in	Wed Nov  2 17:05:33 2005
+--- ./AutoConf/makefile.in.orig	2004-02-08 09:46:11.000000000 +0000
++++ ./AutoConf/makefile.in	2014-01-25 23:08:47.000000000 +0000
+@@ -25,7 +25,7 @@
+ #  Configuration Section
+ # =============================================================================
+ # 
+-prefix	    = @prefix@
++prefix	    = $(DESTDIR)@prefix@
+ exec_prefix = @exec_prefix@
+ 
+ # -------------------------------------------------------
+@@ -42,7 +42,7 @@
+ #  Additionally name the section of the man pages to use.
+ #  This should be 1 (user commands), l (local), or n (new)
+ # 
+-MANDIR     = @mandir@
++MANDIR     = $(DESTDIR)@mandir@
+ MANSECT    = 1
+ 
+ # -------------------------------------------------------
 @@ -67,7 +67,7 @@
  #  Name the C compiler
  # 
diff --git a/textproc/bibtool/files/patch-configure b/textproc/bibtool/files/patch-configure
index 72ebba9a8fa2..f859335184a0 100644
--- a/textproc/bibtool/files/patch-configure
+++ b/textproc/bibtool/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Sun Feb  8 17:35:23 2004
-+++ configure	Wed Nov  2 16:45:08 2005
+--- ./configure.orig	2004-02-08 09:35:23.000000000 +0000
++++ ./configure	2014-01-25 23:08:47.000000000 +0000
 @@ -4566,12 +4566,12 @@
  	kpathsea_dir=
  	kpathsea_lib=
diff --git a/textproc/bibtool/files/patch-main.c b/textproc/bibtool/files/patch-main.c
index 1b974ec34fbc..b8b4648a62b4 100644
--- a/textproc/bibtool/files/patch-main.c
+++ b/textproc/bibtool/files/patch-main.c
@@ -1,5 +1,5 @@
---- main.c.orig	Wed Nov  2 16:45:23 2005
-+++ main.c	Wed Nov  2 16:47:22 2005
+--- ./main.c.orig	2004-02-08 09:41:38.000000000 +0000
++++ ./main.c	2014-01-25 23:08:47.000000000 +0000
 @@ -331,17 +331,6 @@
  
  
diff --git a/textproc/bibtool/pkg-plist b/textproc/bibtool/pkg-plist
index 50a19a9a9297..87e669ec582c 100644
--- a/textproc/bibtool/pkg-plist
+++ b/textproc/bibtool/pkg-plist
@@ -9,4 +9,5 @@ lib/BibTool/month.rsc
 lib/BibTool/opt.rsc
 lib/BibTool/sort_fld.rsc
 lib/BibTool/tex_def.rsc
+man/man1/bibtool.1.gz
 @dirrm lib/BibTool