- Add missing LICENSE

- Remove license text from installed documents

Approved by:	ehaupt (mentor)

5 files changed, 17 insertions, 12 deletions

diff --git a/deskutils/notecase/Makefile b/deskutils/notecase/Makefile
index 21254ae606bc..4e186e58e1ae 100644
--- a/deskutils/notecase/Makefile
+++ b/deskutils/notecase/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	notecase
 PORTVERSION=	1.9.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils textproc
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}_src
@@ -15,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}_src
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	A hierarchical text notes manager
 
+LICENSE=	BSD
+
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gtksourceview2 gnomevfs2 desktopfileutils pkgconfig
 USE_GETTEXT=	yes
@@ -22,7 +24,7 @@ USE_GETTEXT=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	help.ncd license.txt
+PORTDOCS=	help.ncd
 INSTALL_TARGET=	install docinstall
 .endif
 
diff --git a/deskutils/notecase/files/patch-Makefile b/deskutils/notecase/files/patch-Makefile
index 65d49c627a03..269abac95ca9 100644
--- a/deskutils/notecase/files/patch-Makefile
+++ b/deskutils/notecase/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2008-12-09 11:07:06.000000000 +0100
-+++ Makefile	2008-12-12 09:15:50.220188108 +0100
+--- Makefile.orig	2008-12-09 10:07:06.000000000 +0000
++++ Makefile	2010-11-16 17:57:07.716769729 +0000
 @@ -10,9 +10,10 @@
  VERSION=1.9.8
  
@@ -12,7 +12,7 @@
  
  # define top of RPM build area
  topdir=/usr/src/redhat
-@@ -601,18 +602,21 @@
+@@ -601,18 +602,20 @@
  pouninstall:
  	@rm -vf $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/notecase.mo
  	@echo done uninstalling translations
@@ -21,7 +21,6 @@
 +docinstall:
 +	install -d -m 755 "$(docsdir)"
 +	$(INSTALL) -m 644 -c docs/help.ncd "$(docsdir)/help.ncd"
-+	$(INSTALL) -m 644 -c docs/license.txt "$(docsdir)/license.txt"
 +
  #
  # install application
@@ -37,7 +36,7 @@
  	$(INSTALL) -m 644 docs/notecase.xml "$(DESTDIR)$(datadir)/mime/packages/notecase.xml"
  	$(Q)if [ -n "$(NOKIA_MAEMO_BUILD)" ]; then \
  		$(INSTALL) -m 644 docs/notecase.desktop "$(DESTDIR)$(datadir)/applications/hildon/notecase.desktop"; \
-@@ -694,12 +698,6 @@
+@@ -694,12 +697,6 @@
  		echo 'pkg-config error detected $(shell pkg-config --cflags $(LIBS))';\
  		exit 1;\
  	fi;  
@@ -50,7 +49,7 @@
  	$(Q)echo 'Configuration: GNOME_VFS=$(HAVE_GNOME_VFS);GTKSOURCEVIEW=$(HAVE_GTKSOURCEVIEW);DEBUG=$(DEBUG);PROFILE=$(PROFILE);BYTE_ORDER=$(BYTE_ORDER);PLATFORM=$(PLATFORM)' 
  	$(Q)$(SED) 's/^Version:.*/Version:        $(VERSION)/' ./docs/notecase.spec
  	$(Q)$(SED) 's/^Source:.*/Source:         $(archive)_src.tar.gz/' ./docs/notecase.spec
-@@ -820,7 +818,7 @@
+@@ -820,7 +817,7 @@
  #
  # Note: first "make" command forces generating correct help file path in "config.h"
  #
diff --git a/emulators/jzintv/Makefile b/emulators/jzintv/Makefile
index 3fffa33af90f..33180d870203 100644
--- a/emulators/jzintv/Makefile
+++ b/emulators/jzintv/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	jzintv
-DISTVERSION=	1.0b3
+PORTVERSION=	1.0b3
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://spatula-city.org/~im14u2c/intv/dl/
 DISTNAME=	jzintv-1.0-beta3-src
@@ -14,6 +15,8 @@ DISTNAME=	jzintv-1.0-beta3-src
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Portable Intellivision(TM) Emulator
 
+LICENSE=	GPLv2
+
 WRKSRC=		${WRKDIR}/jzintv-1.0-beta3
 BUILD_WRKSRC=	${WRKSRC}/src
 USE_GMAKE=	yes
@@ -55,7 +58,6 @@ do-install:
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/doc
-	${INSTALL_DATA} ${WRKSRC}/COPYING.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Release-Notes.txt ${DOCSDIR}
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/doc)
diff --git a/emulators/jzintv/pkg-plist b/emulators/jzintv/pkg-plist
index f3c269e3e01d..2c0cc3b7a5c5 100644
--- a/emulators/jzintv/pkg-plist
+++ b/emulators/jzintv/pkg-plist
@@ -115,7 +115,6 @@ share/jzintv/rom/joy_diag.rom
 %%PORTDOCS%%%%DOCSDIR%%/doc/utilities/test_cart.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/voice/filtstage.fig
 %%PORTDOCS%%%%DOCSDIR%%/doc/voice/instr_set.txt
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/Release-Notes.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/doc/De_Re_Intellivision
diff --git a/games/blobby/Makefile b/games/blobby/Makefile
index c3b2076ed952..495bbf344b23 100644
--- a/games/blobby/Makefile
+++ b/games/blobby/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	blobby
 PORTVERSION=	0.9b
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Blobby%20Volley%202%20%28Linux%29/Beta%200.9b
 DISTNAME=	blobby2-linux-${PORTVERSION}
@@ -19,6 +20,8 @@ LIB_DEPENDS=	physfs.1:${PORTSDIR}/devel/physfs \
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/include/boost/crc.hpp:${PORTSDIR}/devel/boost-libs
 
+LICENSE=	GPLv2
+
 USE_XORG=	ice x11 xext xxf86vm xdamage xfixes xau xdmcp xrandr xrender
 USE_SDL=	sdl
 USE_GL=		glu
@@ -26,7 +29,7 @@ USE_CMAKE=	yes
 CMAKE_ARGS+=	-DDATADIR:PATH="${DATADIR}"
 WRKSRC=		${WRKDIR}/blobby-beta-0.9b
 
-PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README TODO
 
 post-install:
 .if !defined(NOPORTDOCS)