- Update MASTER_SITES

- Add LICENSE
- Add MAKE_JOBS_SAFE

PR:		ports/172255
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
Feature safe:	yes

3 files changed, 18 insertions, 42 deletions

diff --git a/x11/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index 0d47297495b1..338de78c900f 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -1,24 +1,32 @@
-# New ports collection makefile for:	gnome-clipboard-daemon
-# Date created:				24 January 2004
-# Whom:					Mezz <mezz7@cox.net>
-#
+# Created by: Mezz <mezz7@cox.net>
 # $FreeBSD$
-#
 
 PORTNAME=	gnome-clipboard-daemon
 PORTVERSION=	1.0
 PORTREVISION=	11
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://members.chello.nl/~h.lai/gnome-clipboard-daemon/
+DISTNAME=	${PORTNAME:S,^gnome-,,}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A program that keeps the content of your X clipboard in memory
+COMMENT=	Program that keeps the content of your X clipboard in memory
+
+LICENSE=	GPLv2
 
-PLIST_FILES=	bin/gnome-clipboard-daemon
 USE_BZIP2=	yes
+USE_PKGCONFIG=	build
 USE_GNOME=	gtk20
+MAKE_JOBS_SAFE=	yes
+
+PLIST_FILES=	bin/${PORTNAME}
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^CC=|CC?=| ; \
+		 s|^CFLAGS=|CFLAGS?=| ; \
+		 s|-o clipboard-daemon |-o ${PORTNAME} |' ${WRKSRC}/Makefile
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-clipboard-daemon/distinfo b/x11/gnome-clipboard-daemon/distinfo
index 68a772c4eddd..69af5b569f00 100644
--- a/x11/gnome-clipboard-daemon/distinfo
+++ b/x11/gnome-clipboard-daemon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome-clipboard-daemon-1.0.tar.bz2) = c3bbbd0d687948cb34a09fef798f147cd3c90db346dee587580f1eb1b6cf4704
-SIZE (gnome-clipboard-daemon-1.0.tar.bz2) = 3815
+SHA256 (clipboard-daemon-1.0.tar.bz2) = 1cd86ab391f589f9e9e6102c5d5a2dfca4e337c3fc2ce2120a1e8e71f3aacd0f
+SIZE (clipboard-daemon-1.0.tar.bz2) = 2971
diff --git a/x11/gnome-clipboard-daemon/files/patch-Makefile b/x11/gnome-clipboard-daemon/files/patch-Makefile
deleted file mode 100644
index 9dd7439e1113..000000000000
--- a/x11/gnome-clipboard-daemon/files/patch-Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
---- Makefile.orig	Sat Jan 24 02:38:09 2004
-+++ Makefile	Sat Jan 24 23:52:55 2004
-@@ -1,22 +1,23 @@
- .PHONY: all distdir dist clean
- 
--CC=gcc
--CFLAGS=-Wall -O2
-+#CC=gcc
-+#CFLAGS=-Wall -O2
-+PKGCONFIG=${LOCALBASE}/bin/pkg-config
- VERSION=1.0
- 
- all: gnome-clipboard-daemon
- 
- gnome-clipboard-daemon: main.o gnome-clipboard-daemon.o selection-data-list.o
--	$(CC) $(CFLAGS) main.o gnome-clipboard-daemon.o selection-data-list.o -o gnome-clipboard-daemon `pkg-config --libs gtk+-2.0`
-+	$(CC) $(CFLAGS) main.o gnome-clipboard-daemon.o selection-data-list.o -o gnome-clipboard-daemon `$(PKGCONFIG) --libs gtk+-2.0`
- 
- main.o: main.c
--	$(CC) $(CFLAGS) -c main.c -o main.o `pkg-config --cflags gtk+-2.0`
-+	$(CC) $(CFLAGS) -c main.c -o main.o `$(PKGCONFIG) --cflags gtk+-2.0`
- 
- gnome-clipboard-daemon.o: gnome-clipboard-daemon.c gnome-clipboard-daemon.h
--	$(CC) $(CFLAGS) -c gnome-clipboard-daemon.c -o gnome-clipboard-daemon.o `pkg-config --cflags gtk+-2.0`
-+	$(CC) $(CFLAGS) -c gnome-clipboard-daemon.c -o gnome-clipboard-daemon.o `$(PKGCONFIG) --cflags gtk+-2.0`
- 
- selection-data-list.o: selection-data-list.c selection-data-list.h
--	$(CC) $(CFLAGS) -c selection-data-list.c -o selection-data-list.o `pkg-config --cflags gtk+-2.0`
-+	$(CC) $(CFLAGS) -c selection-data-list.c -o selection-data-list.o `$(PKGCONFIG) --cflags gtk+-2.0`
- 
- distdir:
- 	rm -rf gnome-clipboard-daemon-$(VERSION)