diff options
author | Johan van Selst <johans@FreeBSD.org> | 2013-02-24 13:55:49 +0000 |
---|---|---|
committer | Johan van Selst <johans@FreeBSD.org> | 2013-02-24 13:55:49 +0000 |
commit | 77e53619d1c8d0f4905e80c0ad5a3fbbea31b0a1 (patch) | |
tree | c946c95ef9a4474324ed26c161f66f7104b745de /editors | |
parent | aa95e542f59be9d617f1ddcf387e89923db726a4 (diff) | |
download | ports-77e53619d1c8d0f4905e80c0ad5a3fbbea31b0a1.tar.gz ports-77e53619d1c8d0f4905e80c0ad5a3fbbea31b0a1.zip |
- Upgrade manedit to 1.2.1
- Set new MASTER_SITES
- Grab maintainership
Notes
Notes:
svn path=/head/; revision=312866
Diffstat (limited to 'editors')
-rw-r--r-- | editors/manedit/Makefile | 18 | ||||
-rw-r--r-- | editors/manedit/distinfo | 4 | ||||
-rw-r--r-- | editors/manedit/files/patch-Makefile.FreeBSD | 29 | ||||
-rw-r--r-- | editors/manedit/files/patch-Makefile.install.UNIX | 55 | ||||
-rw-r--r-- | editors/manedit/files/patch-fb.c | 20 | ||||
-rw-r--r-- | editors/manedit/files/patch-manedit.1 | 16 | ||||
-rw-r--r-- | editors/manedit/files/patch-maneditop.c | 13 | ||||
-rw-r--r-- | editors/manedit/pkg-plist | 6 |
8 files changed, 33 insertions, 128 deletions
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile index 6481b408137f..8aedf6b82534 100644 --- a/editors/manedit/Makefile +++ b/editors/manedit/Makefile @@ -1,17 +1,12 @@ -# New ports collection makefile for: manedit -# Date created: 9 February 2001 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# PORTNAME= manedit -PORTVERSION= 0.8.1 -PORTREVISION= 2 +PORTVERSION= 1.2.1 CATEGORIES= editors -MASTER_SITES= http://distro.ibiblio.org/pub/linux/distributions/amigolinux/download/Applications/Editors/manedit-0.8.1/ +MASTER_SITES= http://wolfsinger.com/~wolfpack/packages/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= johans@FreeBSD.org COMMENT= A UNIX manual page editor and viewer WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} @@ -27,8 +22,9 @@ pre-configure: @${CP} ${FILESDIR}/mntent* ${WRKSRC} post-patch: - @${REINPLACE_CMD} -E 's,(viewerfio.c),\1 mntent_compat.c,; \ - s,(viewerfio.h),\1 mntent.h,' \ + @${REINPLACE_CMD} -e '/-o $$(BIN)/s/(CC)/(CXX)/' ${WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} -e '/^MAN/s/.bz2//' ${WRKSRC}/Makefile.install.FreeBSD + @${REINPLACE_CMD} -e '/^SRC_C =/s//& mntent_compat.c/' \ ${WRKSRC}/Makefile.srclist .include <bsd.port.mk> diff --git a/editors/manedit/distinfo b/editors/manedit/distinfo index 4eb17b8854ab..a2b8df838125 100644 --- a/editors/manedit/distinfo +++ b/editors/manedit/distinfo @@ -1,2 +1,2 @@ -SHA256 (manedit-0.8.1.tar.bz2) = 06aaae640b94da545bef2ea96b839e9aaeab1806b9421ddfc99b46c30985db6d -SIZE (manedit-0.8.1.tar.bz2) = 514226 +SHA256 (manedit-1.2.1.tar.bz2) = 8c9a80b2af4ec24db4a22dc0e0bc478feed0c476df23a17a2792384222312592 +SIZE (manedit-1.2.1.tar.bz2) = 818596 diff --git a/editors/manedit/files/patch-Makefile.FreeBSD b/editors/manedit/files/patch-Makefile.FreeBSD deleted file mode 100644 index e4b3ce132ff1..000000000000 --- a/editors/manedit/files/patch-Makefile.FreeBSD +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.FreeBSD.orig Wed Mar 13 00:02:34 2002 -+++ Makefile.FreeBSD Tue Jul 2 14:48:15 2002 -@@ -52,7 +52,7 @@ - # - GTK_CONFIG ?= gtk-config - GTK_CFLAGS = `$(GTK_CONFIG) --cflags` --CFLAGS += $(GTK_CFLAGS) -O2 -Wall \ -+CFLAGS += -I. $(GTK_CFLAGS) \ - -DPREFIX=\"$(PREFIX)\" \ - -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(LOCALBASE)\" - -@@ -116,7 +116,7 @@ - # Build Rules: - # - $(BIN): $(OBJ_C) $(OBJ_CPP) -- $(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR) -+ $(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR) - - all: $(BIN) $(BIN).1.out - -@@ -126,7 +126,7 @@ - # - # This rule is defined externally. - # --include Makefile.install.FreeBSD -+include Makefile.install.UNIX - - - # ######################################################################## diff --git a/editors/manedit/files/patch-Makefile.install.UNIX b/editors/manedit/files/patch-Makefile.install.UNIX deleted file mode 100644 index 18738ca1045e..000000000000 --- a/editors/manedit/files/patch-Makefile.install.UNIX +++ /dev/null @@ -1,55 +0,0 @@ ---- Makefile.install.UNIX.orig Wed Aug 23 06:03:14 2006 -+++ Makefile.install.UNIX Sat Sep 2 12:38:12 2006 -@@ -27,12 +27,12 @@ - MKDIR = mkdir - MKDIRFLAGS = -p -m 0755 - --MAN = $(BIN).1.bz2 -+MAN = $(BIN).1 - ICON = $(BIN).xpm - MANVIEW_ICON = manview.xpm - - BIN_DIR = $(PREFIX)/bin --ICONS_DIR = $(PREFIX)/share/icons -+ICONS_DIR = $(PREFIX)/share/$(BIN)/icons - DATA_DIR = $(PREFIX)/share/$(BIN) - MAN_DIR = $(PREFIX)/man/man1 - -@@ -43,30 +43,30 @@ - install_bin: - @echo "Installing $(BIN) -> $(BIN_DIR)" - @$(MKDIR) $(MKDIRFLAGS) $(BIN_DIR) -- @$(INSTALL) $(INSTBINFLAGS) $(BIN) $(BIN_DIR) -+ @$(BSD_INSTALL_PROGRAM) $(BIN) $(BIN_DIR) - @echo "Installing manview -> $(BIN_DIR)" -- @$(INSTALL) $(INSTSCRFLAGS) utils/manview.sh $(BIN_DIR)/manview -+ @$(BSD_INSTALL_SCRIPT) utils/manview.sh $(BIN_DIR)/manview - @echo "Installing manwrap -> $(BIN_DIR)" -- @$(INSTALL) $(INSTSCRFLAGS) utils/manwrap.sh $(BIN_DIR)/manwrap -+ @$(BSD_INSTALL_SCRIPT) utils/manwrap.sh $(BIN_DIR)/manwrap - - install_data: - @echo "Installing $(MAN) -> $(MAN_DIR)" - @$(MKDIR) $(MKDIRFLAGS) $(MAN_DIR) - @-$(RM) $(RMFLAGS) $(MAN_DIR)/$(BIN).1 - @-$(RM) $(RMFLAGS) $(MAN_DIR)/$(BIN).1.gz -- @$(INSTALL) $(INSTMANFLAGS) $(MAN) $(MAN_DIR) -+ @$(BSD_INSTALL_MAN) $(MAN).out $(MAN_DIR)/$(MAN) - @echo "Installing $(ICON) -> $(ICONS_DIR)" - @$(MKDIR) $(MKDIRFLAGS) $(ICONS_DIR) -- @$(INSTALL) $(INSTDATFLAGS) $(ICON) $(ICONS_DIR) -+ @$(BSD_INSTALL_DATA) $(ICON) $(ICONS_DIR) - @echo "Installing $(MANVIEW_ICON) -> $(ICONS_DIR)" - @$(INSTALL) $(INSTDATFLAGS) $(MANVIEW_ICON) $(ICONS_DIR) - @echo "Installing help files to $(DATA_DIR)/help" - @$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR) - @$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)/help -- @$(COPY) $(COPYFLAGS) help/* $(DATA_DIR)/help -+ @$(BSD_INSTALL_DATA) help/* $(DATA_DIR)/help - @echo "Installing templates to $(DATA_DIR)/templates" - @$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)/templates -- @$(COPY) $(COPYFLAGS) templates/* $(DATA_DIR)/templates -+ @$(BSD_INSTALL_DATA) templates/* $(DATA_DIR)/templates - - preinstall: - @echo "Installing \"$(BIN)\"..." diff --git a/editors/manedit/files/patch-fb.c b/editors/manedit/files/patch-fb.c new file mode 100644 index 000000000000..faa2c01ee076 --- /dev/null +++ b/editors/manedit/files/patch-fb.c @@ -0,0 +1,20 @@ +--- fb.c.orig 2013-02-24 14:29:59.000000000 +0100 ++++ fb.c 2013-02-24 14:30:35.000000000 +0100 +@@ -16,7 +16,7 @@ + # include <sys/mnttab.h> + # include <sys/vfstab.h> + # elif defined(__FreeBSD__) +-/* # include <mntent.h> */ ++# include "mntent.h" + # else + # include <mntent.h> + # endif +@@ -1254,8 +1254,6 @@ static GList *FileBrowserGetDrivePaths(v + } + + return(paths_list); +-#elif defined(__FreeBSD__) +- return(NULL); + #else /* UNIX */ + GList *paths_list = NULL; + #ifdef __SOLARIS__ diff --git a/editors/manedit/files/patch-manedit.1 b/editors/manedit/files/patch-manedit.1 deleted file mode 100644 index 294b94524560..000000000000 --- a/editors/manedit/files/patch-manedit.1 +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 --/usr/man --Global manual pages directory. --.TP - /usr/share/man --Global manual pages directory (used by newer UNIX --distributions). -+Global manual pages directory. - .TP - %%LOCALBASE%%/man - Global X11 manual pages directory. diff --git a/editors/manedit/files/patch-maneditop.c b/editors/manedit/files/patch-maneditop.c deleted file mode 100644 index 78b52d3b221a..000000000000 --- a/editors/manedit/files/patch-maneditop.c +++ /dev/null @@ -1,13 +0,0 @@ ---- maneditop.c.orig Tue Nov 16 13:09:17 2004 -+++ maneditop.c Tue Nov 16 19:27:06 2004 -@@ -238,9 +238,7 @@ - /* Not exist, so need to create a new one */ - rmkdir( - (const char *)tmp_dir_rtn, -- S_IRUSR | S_IWUSR | S_IXUSR | -- S_IRGRP | S_IXGRP | -- S_IROTH | S_IXOTH -+ S_IRUSR | S_IWUSR | S_IXUSR - ); - } - } diff --git a/editors/manedit/pkg-plist b/editors/manedit/pkg-plist index c9b6d4dacfe0..e9ed29396b59 100644 --- a/editors/manedit/pkg-plist +++ b/editors/manedit/pkg-plist @@ -1,8 +1,10 @@ bin/manedit bin/manview bin/manwrap -%%DATADIR%%/help/manpage_writing_procedures -%%DATADIR%%/help/manpage_xml_reference +%%DATADIR%%/help/index.html +%%DATADIR%%/help/manedit_heading.gif +%%DATADIR%%/help/tutorial.html +%%DATADIR%%/help/xml_reference.html %%DATADIR%%/icons/manedit.xpm %%DATADIR%%/icons/manview.xpm %%DATADIR%%/templates/api.mpt |