mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00
Code Issues Releases Activity

Update to 0.4.i.

Browse Source
This commit is contained in:
Maxim Sobolev 2001-03-20 17:04:45 +00:00
parent 53d94c598d
commit 77276edfac
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=40114
12 changed files with 41 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editors/manedit/Makefile
View File

@ -6,10 +6,10 @@
#
PORTNAME= manedit
PORTVERSION= 0.4.h
PORTVERSION= 0.4.i
CATEGORIES= editors
MASTER_SITES= ftp://fox.mit.edu/pub/xsw/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.h/h/}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.i/i/}
EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
@ -25,7 +25,4 @@ pre-patch:
@find ${WRKSRC} \( -name "*.[ch]" -or -name "*.cpp" \) | \
xargs ${PERL} -pi -e 's|malloc\.h|stdlib.h|g'
post-install:
${INSTALL_SCRIPT} ${FILESDIR}/manwrap.sh ${PREFIX}/bin/manwrap
.include <bsd.port.mk>

2
editors/manedit/distinfo
View File

@ -1 +1 @@
MD5 (manedit0.4h.tgz) = 7aa6bf57705f3a8b21fc5d45ff654a4f
MD5 (manedit0.4i.tgz) = 906b5eedd763cc57851e5411dbbc6c44

26
editors/manedit/files/manwrap.sh
View File

@ -1,26 +0,0 @@
#!/bin/sh
#
# A simple script to make man(1) behaviour more gnu'ish.
#
# $FreeBSD$
#
if [ x"${1}" = x"" ]; then
exit
fi
if [ -f "${1}" ]; then
COMPRESSED=`/usr/bin/file "${1}" | /usr/bin/grep "gzip compressed data"`
CAT_CMD=/bin/cat
if [ x"${COMPRESSED}" != x"" ]; then
CAT_CMD=/usr/bin/gzcat
fi
${CAT_CMD} "${1}" | /usr/bin/nroff -mandoc
else
/usr/bin/man -P "/bin/cat" "${@}" 2>/dev/null
ERRCODE=${?}
if [ ${ERRCODE} != 0 ]; then
/bin/echo "No such manpage!" >&2
exit ${ERRCODE}
fi
fi

23
editors/manedit/files/patch-..::include::os.h
View File

@ -1,23 +0,0 @@
$FreeBSD$
--- ../include/os.h.orig Fri Feb 9 02:18:26 2001
+++ ../include/os.h Fri Feb 9 12:23:54 2001
@@ -21,7 +21,7 @@
#include <limits.h>
-#ifdef __linux__
+#if defined(__linux__) && defined(__FreeBSD__)
# include <paths.h>
#endif
@@ -58,7 +58,7 @@
# define _PATH_DEVNULL "/dev/null"
#endif
-#ifndef _AIX
+#if !defined(_AIX) && !defined(__FreeBSD__)
# ifndef _PATH_MAILDIR
# define _PATH_MAILDIR "/var/spool/mail"
# endif

20
editors/manedit/files/patch-..::include::xsw_ctype.h
View File

@ -1,20 +0,0 @@
$FreeBSD$
--- ../include/xsw_ctype.h.orig Fri Feb 9 02:18:26 2001
+++ ../include/xsw_ctype.h Fri Feb 9 12:40:01 2001
@@ -1,6 +1,7 @@
// xsw_ctype.h
// This is intended as a prototype for files using the global/ctype.cpp file.
+#ifndef __FreeBSD__
#if defined(__cplusplus) || defined(c_plusplus)
extern bool isblank(char c);
@@ -11,5 +12,6 @@
extern int isblank( int );
#endif // __cplusplus || c_plusplus
+#endif // __FreeBSD__
extern void ctype_dummy_func();

68
editors/manedit/files/patch-Makefile
View File

@ -1,64 +1,14 @@
$FreeBSD$
--- Makefile.orig Fri Feb 9 02:18:25 2001
+++ Makefile Fri Feb 9 15:41:52 2001
@@ -18,7 +18,7 @@
# You may modify any value as needed. Change only the ones you are
# absolutly sure that requires modification.
--- Makefile 2001/03/20 16:46:26 1.1
+++ Makefile 2001/03/20 16:46:37
@@ -52,7 +52,7 @@
#
-PREFIX = /usr
+PREFIX ?= /usr
GTK_CONFIG ?= gtk-config
GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
-CFLAGS += $(GTK_CFLAGS) -O2 -Wall \
+CFLAGS += $(GTK_CFLAGS) -Wall \
-DPREFIX=\"$(PREFIX)\" \
-DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
# ########################################################################
@@ -49,7 +49,9 @@
# to debug the program.
#
#CFLAGS = `gtk-config --cflags` -g -efence -Wall
-CFLAGS = `gtk-config --cflags` -O2 -Wall
+GTK_CFLAGS != $(GTK_CONFIG) --cflags
+CFLAGS += $(GTK_CFLAGS) -Wall -DPREFIX=\"$(PREFIX)\" \
+ -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
CPPFLAGS = -D__cplusplus -Dc_plusplus
@@ -65,7 +67,7 @@
# to the LIB line depending on what you have set in the CFLAGS line
# farther above.
#
-LIB = `gtk-config --libs`
+LIB != $(GTK_CONFIG) --libs
# Library Directories:
#
@@ -95,9 +97,10 @@
#
include Makefile.srclist
-CC = gcc
-CPP = g++
+CC ?= gcc
+CPP = $(CXX)
BIN = manedit
+SED ?= sed
OBJ_C = $(SRC_C:.c=.o)
OBJ_CPP = $(SRC_CPP:.cpp=.o)
.c.o:
@@ -112,7 +115,7 @@
$(BIN): $(OBJ_C) $(OBJ_CPP)
$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
-all: $(BIN)
+all: $(BIN) $(BIN).1.out
# ########################################################################
@@ -129,5 +132,7 @@
clean:
rm -f a.out core *.o
+$(BIN).1.out: $(BIN).1
+ $(SED) 's|%%PREFIX%%|$(PREFIX)|g' $(BIN).1 > $(BIN).1.out
# ########################################################################

22
editors/manedit/files/patch-Makefile.install.UNIX
View File

@ -1,9 +1,9 @@
$FreeBSD$
--- Makefile.install.UNIX.orig Fri Feb 9 02:18:25 2001
+++ Makefile.install.UNIX Fri Feb 9 15:42:27 2001
@@ -28,27 +28,27 @@
--- Makefile.install.UNIX.orig Sun Feb 25 01:10:47 2001
+++ Makefile.install.UNIX Tue Mar 20 18:55:36 2001
@@ -28,29 +28,27 @@
BIN_DIR = $(PREFIX)/bin
@ -14,21 +14,25 @@ $FreeBSD$
install:
$(MKDIR) $(MKDIRFLAGS) $(BIN_DIR)
- $(INSTALL) $(INSTBINFLAGS) $(BIN) $(BIN_DIR)
+ $(BSD_INSTALL_PROGRAM) $(BIN) $(BIN_DIR)
- $(INSTALL) $(INSTBINFLAGS) $(BIN) $(BIN_DIR)/$(BIN)
- $(INSTALL) $(INSTBINFLAGS) utils/manview.sh $(BIN_DIR)/manview
- $(INSTALL) $(INSTBINFLAGS) utils/manwrap.sh $(BIN_DIR)/manwrap
+ $(BSD_INSTALL_PROGRAM) $(BIN) $(BIN_DIR)/$(BIN)
+ $(BSD_INSTALL_SCRIPT) utils/manview.sh $(BIN_DIR)/manview
+ $(BSD_INSTALL_SCRIPT) utils/manwrap.sh $(BIN_DIR)/manwrap
$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)
- $(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)
$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)/help
- $(COPY) $(COPYFLAGS) help/* $(DATA_DIR)/help
+ $(BSD_INSTALL_DATA) help/* $(DATA_DIR)/help
+ $(BSD_INSTALL_MAN) help/* $(DATA_DIR)/help
$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)
- $(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)
$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)/templates
- $(COPY) $(COPYFLAGS) templates/* $(DATA_DIR)/templates
+ $(BSD_INSTALL_DATA) templates/* $(DATA_DIR)/templates
$(MKDIR) $(MKDIRFLAGS) $(MAN_DIR)
- $(INSTALL) $(INSTMANFLAGS) $(BIN).1 $(MAN_DIR)
- $(INSTALL) $(INSTMANFLAGS) $(BIN).1.out $(MAN_DIR)/$(BIN).1
+ $(BSD_INSTALL_MAN) $(BIN).1.out $(MAN_DIR)/$(BIN).1
$(MKDIR) $(MKDIRFLAGS) $(ICONS_DIR)

23
editors/manedit/files/patch-config.h
View File

@ -1,23 +0,0 @@
$FreeBSD$
--- config.h.orig Mon Feb 19 12:58:51 2001
+++ config.h Mon Feb 19 19:56:21 2001
@@ -22,7 +22,7 @@
/*
* ManEdit global directory:
*/
-#define MEDIT_GLOBAL_DIR "/usr/share/manedit"
+#define MEDIT_GLOBAL_DIR PREFIX"/share/manedit"
/*
* Manual page help sub directory (MEDIT_GLOBAL_DIR will
@@ -101,7 +101,7 @@
* %f = filename
* %p = optional parameters
*/
-#define MEDIT_CMD_MANPAGE_TO_OUTPUT "/usr/bin/man %p %f"
+#define MEDIT_CMD_MANPAGE_TO_OUTPUT PREFIX"/bin/manwrap %p %f"

31
editors/manedit/files/patch-manedit.1
View File

@ -1,20 +1,19 @@
$FreeBSD$
--- manedit.1 2001/02/09 13:39:27 1.1
+++ manedit.1 2001/02/09 13:40:09
@@ -55,11 +55,11 @@
.LP
\fI$HOME/.maneditrc\fP
.br
-\fI/usr/share/manedit/\fP
+\fI%%PREFIX%%/share/manedit/\fP
.br
-\fI/usr/share/manedit/help/\fP
+\fI%%PREFIX%%/share/manedit/help/\fP
.br
-\fI/usr/share/manedit/templates/\fP
+\fI%%PREFIX%%/share/manedit/templates/\fP
.SH "ENVIRONMENT VARIABLES"
--- manedit.1.orig Sun Feb 25 01:10:48 2001
+++ manedit.1 Tue Mar 20 18:49:02 2001
@@ -67,12 +67,8 @@
Manual page template files, used in the creation
of new manual pages.
.TP
\fBHOME\fP
-/usr/man
-Global manual pages directory.
-.TP
/usr/share/man
-Global manual pages directory (used by newer UNIX
-distributions).
+Global manual pages directory.
.TP
%%X11BASE%%/man
Global X11 manual pages directory.

24
editors/manedit/files/patch-pref.c
View File

@ -1,24 +0,0 @@
$FreeBSD$
--- pref.c 2001/02/09 13:07:09 1.1
+++ pref.c 2001/02/09 13:08:32
@@ -1709,15 +1709,15 @@
{
gchar *text[2];
- text[0] = "/usr/man";
+ text[0] = "/usr/share/man";
text[1] = "Global";
gtk_clist_append(GTK_CLIST(w), text);
- text[0] = "/usr/local/man";
+ text[0] = LOCALBASE"/man";
text[1] = "Local";
gtk_clist_append(GTK_CLIST(w), text);
- text[0] = "/usr/X11R6/man";
+ text[0] = X11BASE"/man";
text[1] = "X Window Systems";
gtk_clist_append(GTK_CLIST(w), text);
}

14
editors/manedit/files/patch-prefcb.c
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- prefcb.c 2001/02/09 13:12:30 1.1
+++ prefcb.c 2001/02/09 13:12:46
@@ -698,7 +698,7 @@
PDialogDeleteAllPrompts();
PDialogAddPromptWithBrowse(
- NULL, "Path:", "/usr/man",
+ NULL, "Path:", "/usr/share/man",
(void *)pref,
PrefManPageDirPromptBrowseCB
);

1
editors/manedit/pkg-plist
View File

@ -1,4 +1,5 @@
bin/manedit
bin/manview
bin/manwrap
share/manedit/help/manpage_writing_procedures
share/manedit/help/manpage_xml_referance