- Fix build on 10+ by respecting CC

- Convert simple patch to REINPLACE_CMD
- Support staging

3 files changed, 6 insertions, 19 deletions

diff --git a/polish/tleenx2/Makefile b/polish/tleenx2/Makefile
index 546206621c2b..736a50c1dc6f 100644
--- a/polish/tleenx2/Makefile
+++ b/polish/tleenx2/Makefile
@@ -21,19 +21,16 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/TleenX2-${PORTVERSION}
 
-MAN1=		tleenx2.1
 PORTDOCS=	README gg.txt sms.txt
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},g; s,gcc,${CC},' \
+		${WRKSRC}/iksemel/Makefile
+	@${REINPLACE_CMD} 's,gcc,${CC},' ${WRKSRC}/jabby/Makefile
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/polish/tleenx2/files/patch-iksemel-Makefile b/polish/tleenx2/files/patch-iksemel-Makefile
deleted file mode 100644
index ffb2d67ec3a8..000000000000
--- a/polish/tleenx2/files/patch-iksemel-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- iksemel/Makefile.orig	Tue Sep  2 18:05:32 2003
-+++ iksemel/Makefile	Tue Dec  6 09:23:41 2005
-@@ -1,7 +1,7 @@
- 
- 
- CC = gcc
--CFLAGS = -g -Wall -L/usr/local/lib -I/usr/local/include
-+CFLAGS = -Wall -L$(LOCALBASE)/lib -I$(LOCALBASE)/include
- OBJS = convert.o iks.o ikspool.o jabber.o sha.o core.o iksid.o io.o parser.o \
- 	utility.o
- all: $(OBJS)
diff --git a/polish/tleenx2/pkg-plist b/polish/tleenx2/pkg-plist
index f1669e41f217..957e4c675494 100644
--- a/polish/tleenx2/pkg-plist
+++ b/polish/tleenx2/pkg-plist
@@ -1,4 +1,5 @@
 bin/tleenx2
+man/man1/tleenx2.1.gz
 %%DATADIR%%/pixmaps/archiwum.png
 %%DATADIR%%/pixmaps/away.png
 %%DATADIR%%/pixmaps/beback.png