- Support CC properly

- Add LICENSE
- Stage support

PR:		185346
Submitted by:	ports fury

2 files changed, 18 insertions, 45 deletions

diff --git a/graphics/gkrellkam2/Makefile b/graphics/gkrellkam2/Makefile
index 92d435260113..69ed49b732eb 100644
--- a/graphics/gkrellkam2/Makefile
+++ b/graphics/gkrellkam2/Makefile
@@ -6,23 +6,33 @@ PORTVERSION=	2.0.0
 PORTREVISION=	12
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
+PKGNAMESUFFIX=	2
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GKrellM plugin that display thumbnails of periodically updated images
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+LICENSE=	GPLv2 # (or later)
+
+BUILD_DEPENDS=	gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 USES=		gmake pkgconfig
-LATEST_LINK=	gkrellkam2
 
-MAN5=		gkrellkam-list.5
-PLIST_FILES=	libexec/gkrellm2/plugins/gkrellkam2.so
+PLIST_FILES=	libexec/gkrellm2/plugins/gkrellkam2.so \
+		man/man5/gkrellkam-list.5.gz
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|gcc|$$(CC)|' ${WRKSRC}/Makefile
 
-MAKE_ENV+=	MKDIR="${MKDIR}" \
-		INSTALL_DATA="${INSTALL_DATA}"
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins
+	(cd ${WRKSRC} && ${INSTALL_LIB} gkrellkam2.so \
+		${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins)
+	(cd ${WRKSRC} && ${INSTALL_MAN} gkrellkam-list.5 \
+		${STAGEDIR}${MAN5PREFIX}/man/man5)
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/graphics/gkrellkam2/files/patch-aa b/graphics/gkrellkam2/files/patch-aa
deleted file mode 100644
index d775452b0d81..000000000000
--- a/graphics/gkrellkam2/files/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.orig	Sun Nov 24 04:21:27 2002
-+++ Makefile	Sun Nov 24 04:24:30 2002
-@@ -9,17 +9,14 @@
- # To facilitate packaging- leave blank for normal installation
- DESTDIR =
- 
--# This should point to the GKrellM headers
--GKRELLM_HDRS = /usr/include
--
- CC := gcc
- GTKFLAGS := $(shell pkg-config gtk+-2.0 --cflags)
--CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS) -I$(GKRELLM_HDRS)
-+CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS)
- LDFLAGS := -shared -Wl
--INST_DIR := $(DESTDIR)/usr/lib/gkrellm2/plugins
-+INST_DIR=${PREFIX}/libexec/gkrellm2/plugins
- USER_INST_DIR := $(DESTDIR)$(HOME)/.gkrellm2/plugins
- MANPAGES := gkrellkam-list.5
--MANPAGE_DIR := $(DESTDIR)/usr/share/man/man5
-+MANPAGE_DIR=${PREFIX}/man/man5
- 
- .PHONY: clean install
- 
-@@ -32,9 +29,10 @@
- 	-rm -f $(TARGET).so $(TARGET).o
- 
- install:
--	mkdir -p $(INST_DIR)
--	cp -f $(TARGET).so $(INST_DIR)
--	cp -f $(MANPAGES) $(MANPAGE_DIR)
-+	${MKDIR} ${INST_DIR}
-+	${INSTALL_DATA} ${TARGET}.so ${INST_DIR}
-+	${MKDIR} ${MANPAGE_DIR}
-+	${INSTALL_DATA} ${MANPAGES} ${MANPAGE_DIR}
- 
- userinstall:
- 	mkdir -p $(USER_INST_DIR)