fix symlink issue noticed by steven@ by actually installing two scripts

that do not get installed by qt automatically.
Plus, install pixeltool under /usr/local/bin  as well.
This commit is contained in:
espie 2007-01-29 09:51:28 +00:00
parent c622ee778d
commit 03cd6223ed
2 changed files with 9 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2006/12/29 23:22:51 espie Exp $
# $OpenBSD: Makefile,v 1.29 2007/01/29 09:51:28 espie Exp $
COMMENT-main= "C++ X11 GUI toolkit"
COMMENT-examples= "examples for qt4"
@ -14,7 +14,7 @@ PKGNAME-postgresql= qt4-postgresql-${VERSION}
PKGNAME-examples= qt4-examples-${VERSION}
PKGNAME-sqlite2= qt4-sqlite2-${VERSION}
PKGNAME-sqlite= qt4-sqlite-${VERSION}
FULLPKGNAME-main= qt4-${VERSION}p0
FULLPKGNAME-main= qt4-${VERSION}p1
FULLPKGNAME-html= qt4-html-${VERSION}
SHARED_LIBS= Qt3Support 6.1 \
QtCore 6.1 \
@ -115,7 +115,7 @@ INSTALL_TARGET=sub-src-install_subtargets-ordered \
install_translations install_qmake install_mkspecs
.else
MULTI_PACKAGES+=-examples
PROGRAMS+= qtdemo
PROGRAMS+= qtdemo pixeltool
.endif
@ -182,7 +182,7 @@ DOCS= OPENSOURCE-NOTICE.TXT README
VMEM_WARNING= Yes
NO_REGRESS= Yes
PROGRAMS4=assistant designer findtr linguist lrelease lupdate moc qm2ts qmake \
PROGRAMS4=assistant designer findtr linguist lrelease lupdate moc qmake \
qtconfig uic uic3
PROGRAMS+= rcc qt3to4 syncqt qdbus
@ -202,6 +202,7 @@ post-install:
cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${QT_DOC}
# programs
${INSTALL_PROGRAM_DIR} ${QT_BINDIR}
${INSTALL_PROGRAM} ${WRKBUILD}/bin/{findtr,syncqt} ${QT_BINDIR}
.for p in ${PROGRAMS4}
@ln -sf ${TRUEPREFIX}/lib/qt4/bin/$p ${PREFIX}/bin/$p4
.endfor

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.3 2006/12/29 23:22:51 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2007/01/29 09:51:28 espie Exp $
@pkgpath x11/qt4
%%SHARED%%
bin/assistant4
@ -8,8 +8,8 @@ bin/linguist4
bin/lrelease4
bin/lupdate4
bin/moc4
bin/pixeltool
bin/qdbus
bin/qm2ts4
bin/qmake4
bin/qt3to4
bin/qtconfig4
@ -1864,6 +1864,7 @@ lib/qt4/bin/
lib/qt4/bin/assistant
lib/qt4/bin/assistant4
lib/qt4/bin/designer
lib/qt4/bin/findtr
lib/qt4/bin/linguist
lib/qt4/bin/lrelease
lib/qt4/bin/lupdate
@ -1876,6 +1877,7 @@ lib/qt4/bin/qmake
lib/qt4/bin/qt3to4
lib/qt4/bin/qtconfig
lib/qt4/bin/rcc
lib/qt4/bin/syncqt
lib/qt4/bin/uic
lib/qt4/bin/uic3
lib/qt4/include