From 0308b478dde6155fd62ad3d1fc7f38ab17b25437 Mon Sep 17 00:00:00 2001 From: Patrick Li Date: Thu, 12 Jun 2003 18:58:52 +0000 Subject: [PATCH] Repo-copyed to a more accurate category: ports/misc/wmessage -> ports/x11/wmessage Repo-copyed by: joe (cvs) Approved by: lioux (portmgr) PR: ports/52979 Submitted by: Alexey Dokuchaev --- MOVED | 1 + misc/Makefile | 1 - misc/wmessage/Makefile | 29 ----------------------------- misc/wmessage/distinfo | 1 - misc/wmessage/files/patch-Makefile | 22 ---------------------- misc/wmessage/files/patch-panel.c | 26 -------------------------- misc/wmessage/pkg-descr | 4 ---- misc/wmessage/pkg-plist | 4 ---- x11/Makefile | 1 + x11/wmessage/Makefile | 2 +- 10 files changed, 3 insertions(+), 88 deletions(-) delete mode 100644 misc/wmessage/Makefile delete mode 100644 misc/wmessage/distinfo delete mode 100644 misc/wmessage/files/patch-Makefile delete mode 100644 misc/wmessage/files/patch-panel.c delete mode 100644 misc/wmessage/pkg-descr delete mode 100644 misc/wmessage/pkg-plist diff --git a/MOVED b/MOVED index dab1694444d6..f81fbe7a9a2e 100644 --- a/MOVED +++ b/MOVED @@ -373,3 +373,4 @@ testproc/py-trex||2003-06-08|part of py-xml devel/pear-install|devel/pear-PEAR|2003-06-08|merged textproc/gnomespell-devel|textproc/gnomespell|2003-06-11|rolled into gnomespell mail/evolution-devel|mail/evolution|2003-06-11|rolled into evolution +misc/wmessage|x11/wmessage|2003-06-12|accurate category diff --git a/misc/Makefile b/misc/Makefile index 2c49bfc5edfc..be8bba4b1a3b 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -360,7 +360,6 @@ SUBDIR += wmScoreBoard SUBDIR += wmcalendar SUBDIR += wmcp - SUBDIR += wmessage SUBDIR += wmfirew SUBDIR += wmjulia SUBDIR += wmmand diff --git a/misc/wmessage/Makefile b/misc/wmessage/Makefile deleted file mode 100644 index 8b57f59b70c1..000000000000 --- a/misc/wmessage/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: wmessage -# Date created: Mon Dec 17 20:18:07 EST 2001 -# Whom: Patrick Li -# -# $FreeBSD$ -# - -PORTNAME= wmessage -PORTVERSION= 0.11 -CATEGORIES= misc windowmaker -MASTER_SITES= http://members.ozemail.com.au/~crn/wmessage/ - -MAINTAINER= pat@FreeBSD.org -COMMENT= A WINGs based message viewer similar to xmessage - -BUILD_DEPENDS= get-wraster-flags:${PORTSDIR}/x11-wm/windowmaker - -USE_X_PREFIX= yes -USE_XPM= yes - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/wmessage ${PREFIX}/bin -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/README \ - ${DOCSDIR} -.endif - -.include diff --git a/misc/wmessage/distinfo b/misc/wmessage/distinfo deleted file mode 100644 index 6f2ef2c1f42c..000000000000 --- a/misc/wmessage/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (wmessage-0.11.tar.gz) = 141cb3d0c2096eb44c2912d13b8cee34 diff --git a/misc/wmessage/files/patch-Makefile b/misc/wmessage/files/patch-Makefile deleted file mode 100644 index 545573ab7138..000000000000 --- a/misc/wmessage/files/patch-Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.orig Sun Dec 16 19:13:01 2001 -+++ Makefile Mon Dec 17 20:23:42 2001 -@@ -1,16 +1,13 @@ --PREFIX = /usr/local - --CFLAGS = `get-wraster-flags --cflags` -Wall --LDFLAGS = `get-wraster-flags --ldflags` --LIBS = `get-wraster-flags --libs` --CC = gcc -+CFLAGS += `${X11BASE}/bin/get-wraster-flags --cflags` -I${X11BASE}/include/WINGs -Wall -+LDFLAGS = `${X11BASE}/bin/get-wraster-flags --ldflags` -+LIBS = `${X11BASE}/bin/get-wraster-flags --libs` - - all: wmessage - - wmessage: wmessage.o panel.o - $(CC) -o wmessage wmessage.o panel.o \ - $(CFLAGS) $(LDFLAGS) $(LIBS) -lWMaker -lWINGs -- strip wmessage - - install: wmessage - install -c wmessage $(PREFIX)/bin/wmessage diff --git a/misc/wmessage/files/patch-panel.c b/misc/wmessage/files/patch-panel.c deleted file mode 100644 index b903693ca5ad..000000000000 --- a/misc/wmessage/files/patch-panel.c +++ /dev/null @@ -1,26 +0,0 @@ ---- panel.c.orig Sun Dec 16 19:11:01 2001 -+++ panel.c Mon Dec 17 20:28:33 2001 -@@ -221,7 +221,7 @@ - char *data; - - strcpy (tmpname, "/tmp/wmessage.XXXXXX"); /* last 6 chars must be X */ -- mktemp (tmpname); -+ mkstemp (tmpname); - - if (!tmpname) - return NULL; /* couldn't generate unique name */ -@@ -344,12 +344,12 @@ - int i, j=0, lines=0, longest=0; - - msg = readFile (panel, settings); -- if (msg == NULL) -+ if (msg == NULL) { - if ((settings->reload > 0) && (settings->force == True)) - msg = wstrdup ("Cannot open file -- will keep trying.\n"); - else - return NULL; -- -+ } - for (i = 0; i < strlen (msg); i++) /* count lines */ - if ((*(msg+i)) == '\n') { - lines++; diff --git a/misc/wmessage/pkg-descr b/misc/wmessage/pkg-descr deleted file mode 100644 index 7dcc15a277a2..000000000000 --- a/misc/wmessage/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -wmessage is a WINGs based message viewer similar to xmessage - -WWW: http://members.ozemail.com.au/~crn/wmessage/ -Author: Craig Nellist diff --git a/misc/wmessage/pkg-plist b/misc/wmessage/pkg-plist deleted file mode 100644 index b320f676e803..000000000000 --- a/misc/wmessage/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/wmessage -%%PORTDOCS%%share/doc/wmessage/ChangeLog -%%PORTDOCS%%share/doc/wmessage/README -%%PORTDOCS%%@dirrm share/doc/wmessage diff --git a/x11/Makefile b/x11/Makefile index 6d87b58dbdf3..80269bdb62d8 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -119,6 +119,7 @@ SUBDIR += wmbutton SUBDIR += wmcliphist SUBDIR += wmdrawer + SUBDIR += wmessage SUBDIR += wmfstatus SUBDIR += wmmatrix SUBDIR += wmmenu diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile index 8b57f59b70c1..91b6a18125c4 100644 --- a/x11/wmessage/Makefile +++ b/x11/wmessage/Makefile @@ -7,7 +7,7 @@ PORTNAME= wmessage PORTVERSION= 0.11 -CATEGORIES= misc windowmaker +CATEGORIES= x11 windowmaker MASTER_SITES= http://members.ozemail.com.au/~crn/wmessage/ MAINTAINER= pat@FreeBSD.org