- Remove bogus patch; makes port PREFIX-clean

- Convert to PLIST_FILES/DIRS from 4-line pkg-plist
- Utilize DATADIR macro

3 files changed, 5 insertions, 19 deletions

diff --git a/sysutils/acidlaunch/Makefile b/sysutils/acidlaunch/Makefile
index 3b3beb81f9ac..b53a0e684eb2 100644
--- a/sysutils/acidlaunch/Makefile
+++ b/sysutils/acidlaunch/Makefile
@@ -17,6 +17,8 @@ COMMENT=	An application launcher with simple XML-based configuration syntax
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12 gdkpixbuf libxml2
 
+PLIST_FILES=	bin/${PORTNAME} %%DATADIR%%/config.xml %%DATADIR%%/default.png
+PLIST_DIRS=	%%DATADIR%%
 MAN1=		${PORTNAME}.1
 
 post-extract:
@@ -25,10 +27,9 @@ post-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/${PORTNAME}
-.for file in config.xml default.png
-	${INSTALL_DATA} ${WRKSRC}/prefs/${file} ${PREFIX}/share/${PORTNAME}
-.endfor
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/prefs/config.xml \
+		${WRKSRC}/prefs/default.png ${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/acidlaunch/files/patch-src::Makefile.in b/sysutils/acidlaunch/files/patch-src::Makefile.in
deleted file mode 100644
index 1da0db8ffbd9..000000000000
--- a/sysutils/acidlaunch/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Fri Apr 11 20:41:42 2003
-+++ src/Makefile.in	Fri Apr 11 20:42:11 2003
-@@ -72,7 +72,7 @@
- XML_CONFIG = @XML_CONFIG@
- XML_LIBS = @XML_LIBS@
- 
--CPPFLAGS = -DPREFIX=\"@prefix@\"
-+CPPFLAGS = -DPREFIX=\"${X11BASE}\"
- 
- bin_PROGRAMS = acidlaunch
- 
diff --git a/sysutils/acidlaunch/pkg-plist b/sysutils/acidlaunch/pkg-plist
deleted file mode 100644
index 8f810de30ce7..000000000000
--- a/sysutils/acidlaunch/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/acidlaunch
-share/acidlaunch/config.xml
-share/acidlaunch/default.png
-@dirrm share/acidlaunch