- Fix build ageinst new version of libepplet

- Fix pkg-plist

PR:		60073
Submitted by:	Ports Fury

3 files changed, 21 insertions, 38 deletions

diff --git a/x11/efancylauncher/Makefile b/x11/efancylauncher/Makefile
index d2918906457f..70174fd7ef8d 100644
--- a/x11/efancylauncher/Makefile
+++ b/x11/efancylauncher/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	E-FancyLauncher
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://user.it.uu.se/~adavid/Epplets/
 EXTRACT_SUFX=	.tgz
@@ -14,16 +15,28 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A flexible and easily configurable button bar for Enlightenment
 
-LIB_DEPENDS=	epplet.1:${PORTSDIR}/x11-wm/epplets	# XXX
+LIB_DEPENDS=	epplet.1:${PORTSDIR}/x11-wm/libepplet
 
 WRKSRC=		${WRKDIR}/E-FancyLauncher
 
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
-ALL_TARGET=	clean all
+CPPFLAGS=	-I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${X11BASE}/lib -lepplet ${PTHREAD_LIBS}
 
-post-patch:
-	( cd ${WRKSRC} ; ${MV} makefile Makefile )
+E_ROOT=		${PREFIX}/share/enlightenment
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME}.epplet \
+		${PORTNAME}.c ${LDFLAGS}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.epplet ${PREFIX}/bin
+	@${MKDIR} ${E_ROOT}/epplet_data/${PORTNAME}
+	${TAR} -C ${WRKSRC} -cf - E-FancyLauncher.ABOUT 1.gif 2.gif 3.gif | \
+		${TAR} -C ${E_ROOT}/epplet_data/${PORTNAME} --unlink -xf -
+	@${CHOWN} -R ${SHAREOWN}:${SHAREMODE} ${E_ROOT}/epplet_data/${PORTNAME}
+	@${MKDIR} ${E_ROOT}/epplet_icons
+	${INSTALL_DATA} ${WRKSRC}/E-FancyLauncher.icon ${E_ROOT}/epplet_icons
 
 .include <bsd.port.mk>
diff --git a/x11/efancylauncher/files/patch-aa b/x11/efancylauncher/files/patch-aa
deleted file mode 100644
index 451076f6128e..000000000000
--- a/x11/efancylauncher/files/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
---- makefile.orig	Sat Mar 11 12:05:21 2000
-+++ makefile	Fri Mar 31 09:45:06 2000
-@@ -5,6 +5,8 @@
- DOC = $(NAME).ABOUT
- DATA = 1.gif 2.gif 3.gif
- DOC_OR_DATA = 1
-+EBIN = ${PREFIX}/bin
-+EROOT = ${PREFIX}/share/enlightenment
- DATAPATH = ${EROOT}/epplet_data/$(NAME)
- 
- all: $(EPPLET)
-@@ -13,10 +15,7 @@
- 	@make -i -s pack
- 
- %.epplet: %.c
--	@echo Compiling $@
--	@gcc -Wall -O2 -I/usr/X11R6/include -o $@ $< -lepplet
--	@strip $@;
--	@if [ ! -z "`which sstrip`" ]; then sstrip $@; fi;
-+	${CC} ${CFLAGS} -I${PREFIX}/include -o $@ $< -L${PREFIX}/lib -lepplet
- 
- install: $(EPPLET)
- 	@if [ -z "${EROOT}" -o -z "${EBIN}" ]; then\
-@@ -52,7 +51,7 @@
- 	@echo $(NAME) "uninstalled :("
- 
- clean:
--	rm $(EPPLET) *~
-+	rm $(EPPLET)
- 
- pack: $(EPPLET)
- 	rm *~
diff --git a/x11/efancylauncher/pkg-plist b/x11/efancylauncher/pkg-plist
index 3f1dfe7c58a8..637c3e88d254 100644
--- a/x11/efancylauncher/pkg-plist
+++ b/x11/efancylauncher/pkg-plist
@@ -11,6 +11,8 @@ share/enlightenment/epplet_data/E-FancyLauncher/E-FancyLauncher.ABOUT/MAIN
 share/enlightenment/epplet_data/E-FancyLauncher/E-FancyLauncher.ABOUT/bg.jpg
 share/enlightenment/epplet_data/E-FancyLauncher/E-FancyLauncher.ABOUT/config_window.png
 share/enlightenment/epplet_data/E-FancyLauncher/E-FancyLauncher.ABOUT/verdana.ttf
+share/enlightenment/epplet_icons/E-FancyLauncher.icon
+@unexec rmdir %D/share/enlightenment/epplet_icons 2>/dev/null || true
 @dirrm share/enlightenment/epplet_data/E-FancyLauncher/E-FancyLauncher.ABOUT
 @dirrm share/enlightenment/epplet_data/E-FancyLauncher
-share/enlightenment/epplet_icons/E-FancyLauncher.icon
+@unexec rmdir %D/share/enlightenment/epplet_data 2>/dev/null || true