- Support CC properly

- Stage support

PR:		184233

2 files changed, 10 insertions, 13 deletions

diff --git a/graphics/rgbpaint/Makefile b/graphics/rgbpaint/Makefile
index 2793dcb4a0e8..b98133b09e84 100644
--- a/graphics/rgbpaint/Makefile
+++ b/graphics/rgbpaint/Makefile
@@ -10,6 +10,8 @@ MASTER_SITES=	SF/mtpaint/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Very basic painting program
 
+LICENSE=	GPLv2 # (or later)
+
 USES=		gettext pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
@@ -20,13 +22,19 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MAN1PREFIX}/man/man1 \
 DESKTOP_ENTRIES="rgbPaint" "" "" "${PORTNAME}" "" true
 
 post-patch:
-	@${REINPLACE_CMD} -e '/if \[/s|==|=|g; s|gcc -Wall|${CC}|' \
+	@${REINPLACE_CMD} '/if \[/s|==|=|g ; \
+		 /gcc/s|^|#| ; \
+		 /GTK_LIB/s| -s||' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} 's|$$(MT_MAN_DEST)|$$(DESTDIR)&|g' \
 		${WRKSRC}/doc/Makefile
 	@${REINPLACE_CMD} 's|$$(MT_LANG_DEST)|$$(DESTDIR)&|g' \
 		${WRKSRC}/po/Makefile
-	@${REINPLACE_CMD} 's|$$(BIN_INSTALL)|$$(DESTDIR)&|g' \
+	@${REINPLACE_CMD} 's|$$(BIN_INSTALL)|$$(DESTDIR)&|g ; \
+		 /^LDFLAGS/s|)$$|) -lm -lintl|' \
 		${WRKSRC}/src/Makefile
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rgbpaint
+
 .include <bsd.port.mk>
diff --git a/graphics/rgbpaint/files/patch-src_Makefile b/graphics/rgbpaint/files/patch-src_Makefile
deleted file mode 100644
index 78dea9b64eda..000000000000
--- a/graphics/rgbpaint/files/patch-src_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.orig	2007-01-12 14:22:19.000000000 +0000
-+++ src/Makefile
-@@ -1,7 +1,7 @@
- include ../_conf.txt
- 
- CFLAGS = $(CFLAG)
--LDFLAGS = $(LDFLAG) $(GLIB_LIB)
-+LDFLAGS = $(LDFLAG) $(GLIB_LIB) -lm -lintl
- 
- BIN = rgbpaint
-