ports/81845: sysutils/spassgen: Unbreak (fix pkg-plist)

[Vasil Dimov]

>Number:         81845
>Category:       ports
>Synopsis:       sysutils/spassgen: Unbreak (fix pkg-plist)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 03 14:40:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Vasil Dimov
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
DataMax
>Environment:

System: FreeBSD sinanica.bg.datamax 5.4-STABLE FreeBSD 5.4-STABLE #6: Tue May 10 12:46:25 EEST 2005     root at sinanica.bg.datamax:/usr/obj/usr/src/sys/SINANICA-SMP  i386

>Description:

Change sysutils/spassgen's installation directories to the default
DATADIR and DOCSDIR and create correct pkg-plist.

>How-To-Repeat:

>Fix:

--- spassgen_pkg-plist.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/spassgen/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	28 Feb 2005 01:41:46 -0000	1.2
+++ Makefile	3 Jun 2005 14:30:17 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	spassgen
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	spassgen
@@ -16,8 +17,6 @@
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
-BROKEN=		Incomplete pkg-plist
-
 USE_QT_VER=	3
 USE_GMAKE=	yes
 USE_BZIP2=	yes
@@ -27,7 +26,8 @@
 QMAKE_LOCATION=	${LOCALBASE}/bin
 
 MAKE_ENV+=	QTDIR="${QT_PREFIX}"
-DOCSDIR=	share/doc/HTML/en/${PORTNAME}
+
+.include <bsd.port.pre.mk>
 
 pre-build:
 	(cd ${WRKSRC}; \
@@ -38,14 +38,14 @@
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/spassgen ${PREFIX}/bin
 .for i in 128x128 16x16 32x32 48x48 64x64
-	${MKDIR} ${PREFIX}/share/icons/hicolor/${i}/apps
-	${INSTALL_DATA} ${WRKSRC}/icons/${i}/password.png ${PREFIX}/share/icons/hicolor/${i}/apps
+	${MKDIR} ${DATADIR}/icons/hicolor/${i}/apps
+	${INSTALL_DATA} ${WRKSRC}/icons/${i}/password.png ${DATADIR}/icons/hicolor/${i}/apps
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
 .for i in AUTHORS LICENCE README TODO INSTALL
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/spassgen/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	31 Jul 2004 09:24:39 -0000	1.1
+++ pkg-plist	3 Jun 2005 14:30:17 -0000
@@ -4,9 +4,22 @@
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-share/icons/hicolor/128x128/apps/password.png
-share/icons/hicolor/16x16/apps/password.png
-share/icons/hicolor/32x32/apps/password.png
-share/icons/hicolor/48x48/apps/password.png
-share/icons/hicolor/64x64/apps/password.png
+%%DATADIR%%/icons/hicolor/128x128/apps/password.png
+%%DATADIR%%/icons/hicolor/16x16/apps/password.png
+%%DATADIR%%/icons/hicolor/32x32/apps/password.png
+%%DATADIR%%/icons/hicolor/48x48/apps/password.png
+%%DATADIR%%/icons/hicolor/64x64/apps/password.png
+ at dirrm %%DATADIR%%/icons/hicolor/128x128/apps
+ at dirrm %%DATADIR%%/icons/hicolor/16x16/apps
+ at dirrm %%DATADIR%%/icons/hicolor/32x32/apps
+ at dirrm %%DATADIR%%/icons/hicolor/48x48/apps
+ at dirrm %%DATADIR%%/icons/hicolor/64x64/apps
+ at dirrm %%DATADIR%%/icons/hicolor/128x128
+ at dirrm %%DATADIR%%/icons/hicolor/16x16
+ at dirrm %%DATADIR%%/icons/hicolor/32x32
+ at dirrm %%DATADIR%%/icons/hicolor/48x48
+ at dirrm %%DATADIR%%/icons/hicolor/64x64
+ at dirrm %%DATADIR%%/icons/hicolor
+ at dirrm %%DATADIR%%/icons
+ at dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
--- spassgen_pkg-plist.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: