- Support PREFIX/GTK_CONFIG properly

- Sort pkg-plist

PR: 25434
Submitted by: Ports Fury

4 files changed, 31 insertions, 32 deletions

diff --git a/mail/althea/Makefile b/mail/althea/Makefile
index 15f8555e646e..1ae7067ef2ba 100644
--- a/mail/althea/Makefile
+++ b/mail/althea/Makefile
@@ -7,21 +7,22 @@
 
 PORTNAME=	althea
 PORTVERSION=	0.3.4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_GTK=	yes
+MAKE_ENV=	MKDIR="${MKDIR}"
 MAKEFILE=	${FILESDIR}/Makefile.bsd
-MAKE_ARGS+=	-j 2
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}" MKDIR="${MKDIR}"
 
 post-patch:
-	${PERL} -pi -e "s%/etc%${LOCALBASE}/etc%g" \
+	@${PERL} -pi -e "s|/etc|${PREFIX}/etc|g" \
 		${WRKSRC}/Documentation/help.html \
+		${WRKSRC}/load_config.cpp \
 		${WRKSRC}/load_config.h
 
 .include <bsd.port.mk>
diff --git a/mail/althea/files/Makefile.bsd b/mail/althea/files/Makefile.bsd
index cec0ff6108b5..84f6ced50a1a 100644
--- a/mail/althea/files/Makefile.bsd
+++ b/mail/althea/files/Makefile.bsd
@@ -4,20 +4,18 @@ NOMAN=	forget it :(
 objs!=	${MAKE} -V OBJS -f ${.CURDIR}/Makefile
 SRCS:=	${objs:.o=.cpp} main.cpp
 
-BINDIR=${LOCALBASE}/bin
-DOCDIR=${LOCALBASE}/share/doc/${PROG}
-PIXDIR=${LOCALBASE}/share/${PROG}
+BINDIR=${PREFIX}/bin
+DOCDIR=${PREFIX}/share/doc/${PROG}
+PIXDIR=${PREFIX}/share/${PROG}
 
 # Compiled-in pathes:
 CXXFLAGS+=-DDOCDIR=\"${DOCDIR}\" -DPIXDIR=\"${PIXDIR}\"
 
 # Use the GTK's CFLAGS:
-CXXFLAGS+=-I${LOCALBASE}/include/gtk12 -I${LOCALBASE}/include/glib12 \
-	-I${LOCALBASE}/include -I${LOCALBASE}/include
+CXXFLAGS+=`${GTK_CONFIG} --cflags`
 
 # Use the GTK's libraries:
-LDADD+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lgtk12 -lgdk12 \
-	-Wl,-E -lgmodule12 -lglib12 -lintl -lxpg4 -lXext -lX11 -lm
+LDADD+=`${GTK_CONFIG} --libs`
 
 # A hack to ensure C++ is called to do the final linking:
 CC:=	${CXX}
@@ -26,9 +24,9 @@ ${DOCDIR}/images ${PIXDIR}:
 	${MKDIR} $@
 
 beforeinstall: ${DOCDIR}/images ${PIXDIR}
-	${INSTALL_DATA} ${.CURDIR}/Documentation/*.* ${DOCDIR}
-	${INSTALL_DATA} ${.CURDIR}/Documentation/images/*.* ${DOCDIR}/images
-	${INSTALL_DATA} ${.CURDIR}/pixmaps/*.* ${PIXDIR}
-	${INSTALL_DATA} ${.CURDIR}/althearc.example ${LOCALBASE}/etc/
+	${BSD_INSTALL_DATA} ${.CURDIR}/Documentation/*.* ${DOCDIR}
+	${BSD_INSTALL_DATA} ${.CURDIR}/Documentation/images/*.* ${DOCDIR}/images
+	${BSD_INSTALL_DATA} ${.CURDIR}/pixmaps/*.* ${PIXDIR}
+	${BSD_INSTALL_DATA} ${.CURDIR}/althearc.example ${PREFIX}/etc/
 
 .include <bsd.prog.mk>
diff --git a/mail/althea/pkg-descr b/mail/althea/pkg-descr
index 0e42cbbe38a2..95b739613c06 100644
--- a/mail/althea/pkg-descr
+++ b/mail/althea/pkg-descr
@@ -1,7 +1,7 @@
 The designers of Althea felt that there wasn't a stable, easy to
-use, GUI, IMAP (Internet  Message Access Protocol) e-mail client
-for X Windows.  The design goal was a stable  e-mail client with
-the  richness of  usability of  Microsoft's Outlook,  Qualcomm's
-Eudora, and Cyrusoft's Mulberry.
+use, GUI, IMAP (Internet Message Access Protocol) e-mail client
+for X/GTK+. The design goal was a stable  e-mail client with the
+richness of usability of Microsoft's Outlook, Qualcomm's Eudora,
+and Cyrusoft's Mulberry.
 
 WWW: http://althea.sourceforge.net/
diff --git a/mail/althea/pkg-plist b/mail/althea/pkg-plist
index 6e5753068e11..9bffadd6b0d1 100644
--- a/mail/althea/pkg-plist
+++ b/mail/althea/pkg-plist
@@ -1,17 +1,5 @@
 bin/althea
 etc/althearc.example
-share/doc/althea/images/althea.png
-share/doc/althea/images/altheaRound.png
-share/doc/althea/images/fileMenu.png
-share/doc/althea/images/helpMenu.png
-share/doc/althea/images/messageMenu.png
-share/doc/althea/images/sf.gif
-share/doc/althea/images/toolbar.png
-share/doc/althea/images/typicalSession.png
-share/doc/althea/images/typicalSessionSmall.png
-@dirrm share/doc/althea/images
-share/doc/althea/help.html
-@dirrm share/doc/althea
 share/althea/address.xpm
 share/althea/althea.xpm
 share/althea/attach.xpm
@@ -26,4 +14,16 @@ share/althea/reply.xpm
 share/althea/save.xpm
 share/althea/send.xpm
 share/althea/server.xpm
+share/doc/althea/help.html
+share/doc/althea/images/althea.png
+share/doc/althea/images/altheaRound.png
+share/doc/althea/images/fileMenu.png
+share/doc/althea/images/helpMenu.png
+share/doc/althea/images/messageMenu.png
+share/doc/althea/images/sf.gif
+share/doc/althea/images/toolbar.png
+share/doc/althea/images/typicalSession.png
+share/doc/althea/images/typicalSessionSmall.png
+@dirrm share/doc/althea/images
+@dirrm share/doc/althea
 @dirrm share/althea