ports/59012: Update port: textproc/unroff
KATO Tsuguru
tkato at prontomail.com
Thu Nov 6 15:10:32 UTC 2003
>Number: 59012
>Category: ports
>Synopsis: Update port: textproc/unroff
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 06 07:10:17 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build
- Utilize DATADIR/DOCSDIR
New file:
files/patch-c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/textproc/unroff/Makefile textproc/unroff/Makefile
--- /usr/ports/textproc/unroff/Makefile Mon Nov 3 14:38:26 2003
+++ textproc/unroff/Makefile Thu Nov 6 22:12:50 2003
@@ -7,51 +7,38 @@
PORTNAME= unroff
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= textproc
-MASTER_SITES= ${UNROFF_SITE}/dist/ \
- ${UNROFF_SITE}/contrib/
-DISTNAME= ${PORTNAME}-1.0
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PATCH1} ${PATCH2}
-
-MAINTAINER= ports at freebsd.org
-COMMENT= A programmable troff translator with backend for HTML
-
-RUN_DEPENDS= elk:${PORTSDIR}/lang/elk
-BUILD_DEPENDS= elk:${PORTSDIR}/lang/elk
+MASTER_SITES= http://www-rn.informatik.uni-bremen.de/software/unroff/%SUBDIR%/
+MASTER_SITE_SUBDIR= dist
+DIST_SUBDIR= unroff
+DISTNAME= ${PORTNAME}-${PORTVERSION:R}
-BROKEN= "Does not build; will be removed after Feb 2"
+PATCH_SITES= ${MASTER_SITES}
+PATCH_SITE_SUBDIR= contrib
+PATCHFILES= me-misc-patch.gz misc-patch-2.gz
+PATCH_DIST_STRIP= -p1
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-DIST_SUBDIR= unroff
-PATCH_STRIP= -p1
+MAINTAINER= ports at FreeBSD.org
+COMMENT= A programmable troff translator with backend for HTML
-UNROFF_SITE= http://www-rn.informatik.uni-bremen.de/software/unroff
-PATCH1= me-misc-patch
-PATCH2= misc-patch-2
+LIB_DEPENDS= elk.0:${PORTSDIR}/lang/elk
BUILD_WRKSRC= ${WRKSRC}/src
MAN1= unroff.1 unroff-html.1 unroff-html-man.1 \
unroff-html-me.1 unroff-html-ms.1
-pre-patch:
- @${ECHO_MSG} "===> Applying distribution patches for ${PKGNAME}"
- @(cd ${_DISTDIR}; \
- if [ ${PATCH_DEBUG_TMP} = yes ]; then \
- ${ECHO_MSG} "===> Applying distribution patch ${PATCH1}" ; \
- fi; \
- ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCH1}; \
- if [ ${PATCH_DEBUG_TMP} = yes ]; then \
- ${ECHO_MSG} "===> Applying distribution patch ${PATCH2}" ; \
- fi; \
- ${PATCH} ${PATCH_DIST_ARGS} -p1 < ${PATCH2})
-
do-install:
- @${MKDIR} ${DATADIR}/misc
- ${INSTALL_PROGRAM} ${WRKSRC}/src/unroff ${PREFIX}/bin/unroff
- ${CP} -R ${WRKSRC}/scm ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/tmac.hyper ${WRKSRC}/misc/sample.unroff ${DATADIR}/misc
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/unroff ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
+ @${MKDIR} ${DATADIR}/misc
+.for i in doc/tmac.hyper misc/sample.unroff
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${DATADIR}/misc
+.endfor
+ ${TAR} -C ${WRKSRC} -cf - scm | \
+ ${TAR} -C ${DATADIR} --unlink -xf -
+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/manual.ms ${DOCSDIR}
diff -urN /usr/ports/textproc/unroff/distinfo textproc/unroff/distinfo
--- /usr/ports/textproc/unroff/distinfo Thu Mar 6 18:46:39 1997
+++ textproc/unroff/distinfo Thu Nov 6 22:04:14 2003
@@ -1,3 +1,3 @@
MD5 (unroff/unroff-1.0.tar.gz) = 918e9c065cb7486c4b885da7809f37e7
-MD5 (unroff/me-misc-patch) = e0cfe9a5012f573cf774115562f4462e
-MD5 (unroff/misc-patch-2) = ebedbf1a8dccfeb5ef3f996ba15374b2
+MD5 (unroff/me-misc-patch.gz) = a6af8590955e5a54e399cf0ab01fc9c4
+MD5 (unroff/misc-patch-2.gz) = b941bcec35911cbe117a392e07bba4df
diff -urN /usr/ports/textproc/unroff/files/patch-a textproc/unroff/files/patch-a
--- /usr/ports/textproc/unroff/files/patch-a Sat Apr 12 23:29:43 2003
+++ textproc/unroff/files/patch-a Thu Nov 6 22:21:44 2003
@@ -1,68 +1,43 @@
-diff -cr unroff-1.0.orig/src/Makefile unroff-1.0/src/Makefile
-*** unroff-1.0.orig/src/Makefile Wed Aug 23 14:12:48 1995
---- unroff-1.0/src/Makefile Mon Feb 12 18:51:08 1996
-***************
-*** 1,14 ****
- # $Revision: 1.12 $
-
- ### You need a C compiler that compiles ANSI C code.
-! CC = gcc
-! CFLAGS = -Wall -pedantic -O
-
- ### If you need additional linker flags add them here.
-! LDFLAGS =
-
- ### The directory where the Elk installation resides on your system.
-! ELKDIR = /usr/elk
-
- ### Additional libraries. You may want to insert the output of the
- ### shell-script $(ELKDIR)/lib/ldflags here.
---- 1,14 ----
- # $Revision: 1.12 $
-
- ### You need a C compiler that compiles ANSI C code.
-! #CC = gcc
-! CFLAGS += -DBSD
-
- ### If you need additional linker flags add them here.
-! LDFLAGS = -s
-
- ### The directory where the Elk installation resides on your system.
-! ELKDIR = ${PREFIX}/share/elk
-
- ### Additional libraries. You may want to insert the output of the
- ### shell-script $(ELKDIR)/lib/ldflags here.
-***************
-*** 18,24 ****
- MAKEDEP = makedepend
-
- ### The directory under which you will install the Scheme files.
-! DIR = /usr/local/lib/unroff
-
- ### The default output format.
- FORMAT = html
---- 18,24 ----
- MAKEDEP = makedepend
-
- ### The directory under which you will install the Scheme files.
-! DIR = ${PREFIX}/share/unroff
-
- ### The default output format.
- FORMAT = html
-***************
-*** 30,36 ****
- ### -------------------------------------------------------------------------
-
- SHELL = /bin/sh
-! INCLUDE = -I$(ELKDIR)/include
- ELK = $(ELKDIR)/lib/module.o
- DEFS = -DDEFAULT_DIR=\"$(DIR)\" -DDEFAULT_FORMAT=\"$(FORMAT)\"
- CTAGS = ctags -t -w
---- 30,36 ----
- ### -------------------------------------------------------------------------
-
- SHELL = /bin/sh
-! INCLUDE = -I${PREFIX}/include/elk
- ELK = $(ELKDIR)/lib/module.o
- DEFS = -DDEFAULT_DIR=\"$(DIR)\" -DDEFAULT_FORMAT=\"$(FORMAT)\"
- CTAGS = ctags -t -w
+--- src/Makefile.orig Wed Aug 23 21:12:48 1995
++++ src/Makefile Thu Nov 6 22:21:29 2003
+@@ -1,24 +1,24 @@
+ # $Revision: 1.12 $
+
+ ### You need a C compiler that compiles ANSI C code.
+-CC = gcc
+-CFLAGS = -Wall -pedantic -O
++#CC = gcc
++CFLAGS += -DBSD
+
+ ### If you need additional linker flags add them here.
+ LDFLAGS =
+
+ ### The directory where the Elk installation resides on your system.
+-ELKDIR = /usr/elk
++ELKDIR = ${PREFIX}/share/elk
+
+ ### Additional libraries. You may want to insert the output of the
+ ### shell-script $(ELKDIR)/lib/ldflags here.
+-LIBS = -lm
++LIBS = -lm -lelk -L${LOCALBASE}/lib
+
+ ### The makedepend program (it's usually installed with the X11 binaries).
+ MAKEDEP = makedepend
+
+ ### The directory under which you will install the Scheme files.
+-DIR = /usr/local/lib/unroff
++DIR = ${PREFIX}/share/unroff
+
+ ### The default output format.
+ FORMAT = html
+@@ -30,8 +30,8 @@
+ ### -------------------------------------------------------------------------
+
+ SHELL = /bin/sh
+-INCLUDE = -I$(ELKDIR)/include
+-ELK = $(ELKDIR)/lib/module.o
++INCLUDE = -I${LOCALBASE}/include/elk
++#ELK = $(ELKDIR)/lib/module.o
+ DEFS = -DDEFAULT_DIR=\"$(DIR)\" -DDEFAULT_FORMAT=\"$(FORMAT)\"
+ CTAGS = ctags -t -w
+
diff -urN /usr/ports/textproc/unroff/files/patch-c textproc/unroff/files/patch-c
--- /usr/ports/textproc/unroff/files/patch-c Thu Jan 1 09:00:00 1970
+++ textproc/unroff/files/patch-c Thu Nov 6 22:13:48 2003
@@ -0,0 +1,14 @@
+--- src/error.h.orig Fri Jun 2 22:16:01 1995
++++ src/error.h Thu Nov 6 22:13:38 2003
+@@ -12,9 +12,11 @@
+ void write_error(char *) NORETURN;
+ void open_error(char *) NORETURN;
+
++#if 0
+ /* Redefined to add NORETURN
+ */
+ extern Primitive_Error() NORETURN;
++#endif
+
+ char *printable_string(char *, int);
+ char *printable_char(char);
diff -urN /usr/ports/textproc/unroff/pkg-plist textproc/unroff/pkg-plist
--- /usr/ports/textproc/unroff/pkg-plist Sat Apr 12 23:29:43 2003
+++ textproc/unroff/pkg-plist Thu Nov 6 22:10:07 2003
@@ -1,22 +1,22 @@
bin/unroff
-share/unroff/misc/sample.unroff
-share/unroff/misc/tmac.hyper
-share/unroff/scm/troff.scm
-share/unroff/scm/troff.scm.orig
-share/unroff/scm/html/common.scm
-share/unroff/scm/html/common.scm.orig
-share/unroff/scm/html/m.scm
-share/unroff/scm/html/man.scm
-share/unroff/scm/html/me.scm
-share/unroff/scm/html/me.scm.orig
-share/unroff/scm/html/ms.scm
-share/unroff/scm/html/ms.scm.orig
-share/unroff/scm/misc/hyper.scm
-share/unroff/scm/misc/hyper.scm.orig
-%%PORTDOCS%%share/doc/unroff/manual.ms
-%%PORTDOCS%%@dirrm share/doc/unroff
- at dirrm share/unroff/misc
- at dirrm share/unroff/scm/html
- at dirrm share/unroff/scm/misc
- at dirrm share/unroff/scm
- at dirrm share/unroff
+%%PORTDOCS%%%%DOCSDIR%%/manual.ms
+%%DATADIR%%/misc/sample.unroff
+%%DATADIR%%/misc/tmac.hyper
+%%DATADIR%%/scm/troff.scm
+%%DATADIR%%/scm/troff.scm.orig
+%%DATADIR%%/scm/html/common.scm
+%%DATADIR%%/scm/html/common.scm.orig
+%%DATADIR%%/scm/html/m.scm
+%%DATADIR%%/scm/html/man.scm
+%%DATADIR%%/scm/html/me.scm
+%%DATADIR%%/scm/html/me.scm.orig
+%%DATADIR%%/scm/html/ms.scm
+%%DATADIR%%/scm/html/ms.scm.orig
+%%DATADIR%%/scm/misc/hyper.scm
+%%DATADIR%%/scm/misc/hyper.scm.orig
+ at dirrm %%DATADIR%%/scm/misc
+ at dirrm %%DATADIR%%/scm/html
+ at dirrm %%DATADIR%%/scm
+ at dirrm %%DATADIR%%/misc
+ at dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list