aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsem <sem@FreeBSD.org>2005-06-08 18:03:12 +0800
committersem <sem@FreeBSD.org>2005-06-08 18:03:12 +0800
commite4bf168f5cfe0c9dd780838638d0b17ab72f0901 (patch)
tree1da841e664f2a6dbe61ef8f71c7d94a2cfd4ab5f
parent9ce5041d2a11154a3e36d964816339176b6d0f45 (diff)
downloadfreebsd-ports-gnome-e4bf168f5cfe0c9dd780838638d0b17ab72f0901.tar.gz
freebsd-ports-gnome-e4bf168f5cfe0c9dd780838638d0b17ab72f0901.tar.zst
freebsd-ports-gnome-e4bf168f5cfe0c9dd780838638d0b17ab72f0901.zip
- Unbreak. Fix pkg-plist.
- Utilize DATADIR and DOCSDIR PR: ports/81845 Submitted by: Vasil Dimov <vd@datamax.bg> Approved by: no maintainer reaction on broken port (3 monthes)
-rw-r--r--sysutils/spassgen/Makefile16
-rw-r--r--sysutils/spassgen/pkg-plist23
2 files changed, 26 insertions, 13 deletions
diff --git a/sysutils/spassgen/Makefile b/sysutils/spassgen/Makefile
index bd3324e2c602..2a18bddf983c 100644
--- a/sysutils/spassgen/Makefile
+++ b/sysutils/spassgen/Makefile
@@ -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 @@ COMMENT= Qt GUI secure password generator
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
-BROKEN= Incomplete pkg-plist
-
USE_QT_VER= 3
USE_GMAKE= yes
USE_BZIP2= yes
@@ -27,7 +26,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
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 @@ pre-build:
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>
diff --git a/sysutils/spassgen/pkg-plist b/sysutils/spassgen/pkg-plist
index 7098c023f9c6..3c6ccc20d99e 100644
--- a/sysutils/spassgen/pkg-plist
+++ b/sysutils/spassgen/pkg-plist
@@ -4,9 +4,22 @@ bin/spassgen
%%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
+@dirrm %%DATADIR%%/icons/hicolor/128x128/apps
+@dirrm %%DATADIR%%/icons/hicolor/16x16/apps
+@dirrm %%DATADIR%%/icons/hicolor/32x32/apps
+@dirrm %%DATADIR%%/icons/hicolor/48x48/apps
+@dirrm %%DATADIR%%/icons/hicolor/64x64/apps
+@dirrm %%DATADIR%%/icons/hicolor/128x128
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor/64x64
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%