summaryrefslogtreecommitdiffstats
path: root/deskutils
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/qorganizer/Makefile25
-rw-r--r--deskutils/tuxcards/Makefile15
2 files changed, 13 insertions, 27 deletions
diff --git a/deskutils/qorganizer/Makefile b/deskutils/qorganizer/Makefile
index dc96301..9c34f05 100644
--- a/deskutils/qorganizer/Makefile
+++ b/deskutils/qorganizer/Makefile
@@ -9,9 +9,10 @@ MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= qOrganizer-${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
-COMMENT= A general organizer that includes calendar with jurnal and schedule
+COMMENT= General organizer that includes calendar with jurnal and schedule
-USE_QT4= gui network qmake_build moc_build rcc_build sql
+USES= qmake
+USE_QT4= gui network moc_build rcc_build sql
WRKSRC= ${WRKDIR}/qOrganizer/src
PLIST_FILES= bin/qOrganizer share/pixmaps/qOrganizer.png
@@ -22,20 +23,12 @@ DESKTOP_ENTRIES= "qOrganizer" \
"qOrganizer" \
"qOrganizer" \
"Qt;KDE;Office;" \
- "false"
+ "true"
-NO_STAGE= yes
-pre-build:
- @cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE}
-
-post-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/qOrganizer ${PREFIX}/bin
- @${INSTALL_DATA} ${WRKSRC}/../qOrganizer.png ${PREFIX}/share/pixmaps
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
- @${INSTALL_DATA} ${WRKSRC}/../${doc} ${DOCSDIR}
-.endfor
-.endif
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/qOrganizer ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/../qOrganizer.png ${STAGEDIR}${PREFIX}/share/pixmaps
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/../,} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/deskutils/tuxcards/Makefile b/deskutils/tuxcards/Makefile
index 2f16663..4a90f0a 100644
--- a/deskutils/tuxcards/Makefile
+++ b/deskutils/tuxcards/Makefile
@@ -12,19 +12,12 @@ MAINTAINER= johans@FreeBSD.org
COMMENT= Tool for managing notes within a hierarchical tree
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_QT4= gui xml qmake_build moc_build uic_build rcc_build
+USES= qmake
+USE_QT4= gui xml moc_build uic_build rcc_build
-MAKE_ENV= QTDIR="${QT_PREFIX}"
PLIST_FILES= bin/tuxcards
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-do-configure:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- ${QMAKE} -spec ${QMAKESPEC} tuxcards.pro
-
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
OpenPOWER on IntegriCloud