Hi ports@,
please find below a diff to update klogic. That means one KDE3 port less
in our tree. *hooray*
Comments? Ok? Yes, it is KDE so be brave!
Best regards
Rafael Sadowski
Index: Makefile
===================================================================
RCS file: /cvs/ports/cad/klogic/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile 10 Apr 2017 11:45:24 -0000 1.36
+++ Makefile 28 Apr 2017 19:30:11 -0000
@@ -1,45 +1,31 @@
# $OpenBSD: Makefile,v 1.36 2017/04/10 11:45:24 sthen Exp $
-COMMENT= logic circuit simulator for KDE
+COMMENT = logic circuit simulator for KDE
-DISTNAME= klogic-1.6
-REVISION= 12
-CATEGORIES= cad education x11 x11/kde
-
-MASTER_SITES= https://distfiles.nl/
-
-# GPL
-PERMIT_PACKAGE_CDROM= Yes
-
-WANTLIB += ${KDE}/DCOP ${KDE}/kdecore ${KDE}/kdefx ${KDE}/kdesu
-WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient
-WANTLIB += GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft Xi Xinerama Xmu
-WANTLIB += Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm expat fontconfig
-WANTLIB += freetype idn jpeg lcms m mng png pthread ${LIBCXX} util xcb
-WANTLIB += xcb-glx z X11-xcb Xau Xdmcp fam glapi pthread-stubs xcb-dri2
-
-LIB_DEPENDS= x11/kde/libs3
-
-MODULES= x11/kde devel/gettext
-MODKDE_VERSION= 3.1
-MODKDE_FIXUP_DATADIR= Yes
-
-PORTHOME= ${WRKDIR}
-
-MAKE_ENV= KDEDIR="${LOCALBASE}"
-MAKE_FLAGS= ${MODKDE_MAKE_FLAGS}
-
-USE_GMAKE= Yes
-CONFIGURE_STYLE= autoconf
-MODGNU_CONFIG_GUESS_DIRS= ${MODKDE_CONFIG_GUESS_DIRS}
-CONFIGURE_ARGS= ${MODKDE_CONFIGURE_ARGS}
-CONFIGURE_ENV= ${MODKDE_CONFIGURE_ENV}
-AUTOCONF_VERSION= 2.57
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
- mv ${PREFIX}/share/icons/klogic/*.xpm ${PREFIX}/share/pixmaps/
- rmdir ${PREFIX}/share/icons/klogic
- rmdir ${PREFIX}/share/icons
+DISTNAME = klogic-4.0.2
+
+CATEGORIES = cad education x11
+
+HOMEPAGE = http://www.a-rostin.de
+
+MASTER_SITES = ${HOMEPAGE}/klogic/releases/
+EXTRACT_SUFX = .tar.gz
+
+WANTLIB += QtDBus QtGui QtNetwork QtSvg QtXml c
+WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio m pthread
+
+# License information from homepage
+# GPLv3
+PERMIT_PACKAGE_CDROM = Yes
+
+MODULES = x11/kde4 \
+ devel/cmake
+
+RUN_DEPENDS = devel/desktop-file-utils \
+ x11/gtk+3,-guic
+
+BUILD_DEPENDS = devel/gettext-tools
+
+NO_TEST = Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/cad/klogic/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 18 Jan 2015 03:12:54 -0000 1.6
+++ distinfo 28 Apr 2017 19:30:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (klogic-1.6.tar.gz) = pHRXim+xeOJKqYS7iEl+u8NB1s6LxMOzh3cYKmUqBH4=
-SIZE (klogic-1.6.tar.gz) = 973713
+SHA256 (klogic-4.0.2.tar.gz) = gyDh7pAz8OvD61gmBrWh0JDdmBDbZ5qJFPiWojNPPCk=
+SIZE (klogic-4.0.2.tar.gz) = 294804
Index: patches/patch-klogic_klogic_h
===================================================================
RCS file: /cvs/ports/cad/klogic/patches/patch-klogic_klogic_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-klogic_klogic_h
--- patches/patch-klogic_klogic_h 23 May 2010 09:13:15 -0000 1.1
+++ patches/patch-klogic_klogic_h 28 Apr 2017 19:30:11 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-klogic_klogic_h,v 1.1 2010/05/23 09:13:15 espie Exp $
---- klogic/klogic.h.orig Sat May 22 12:48:04 2010
-+++ klogic/klogic.h Sat May 22 12:48:10 2010
-@@ -57,7 +57,7 @@ namespace Global
- static QString comment;
- };
-
--};
-+}
-
- class uniqueID
- {
Index: patches/patch-klogic_mainw_cpp
===================================================================
RCS file: /cvs/ports/cad/klogic/patches/patch-klogic_mainw_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-klogic_mainw_cpp
--- patches/patch-klogic_mainw_cpp 23 May 2010 09:13:15 -0000 1.2
+++ patches/patch-klogic_mainw_cpp 28 Apr 2017 19:30:11 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-klogic_mainw_cpp,v 1.2 2010/05/23 09:13:15 espie Exp $
---- klogic/mainw.cpp.orig Sat Nov 15 02:21:33 2003
-+++ klogic/mainw.cpp Sat May 22 12:04:04 2010
-@@ -82,7 +82,7 @@ void MainWidget::setPATH(KApplication *app)
- /* methods of class MainWidget */
- /***************************************************/
- MainWidget::MainWidget(KApplication *_app, const char *file)
-- :KMainWindow(NULL)
-+ :KMainWindow(NULL, file)
- {
- app = _app;
- setPATH(app);
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/cad/klogic/pkg/DESCR,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 DESCR
--- pkg/DESCR 15 Mar 2005 01:57:02 -0000 1.3
+++ pkg/DESCR 28 Apr 2017 19:30:11 -0000
@@ -1,8 +1,9 @@
Application for building and simulating digital circuits easily.
Provides an easy way for building circuits containing standard
-components like AND, OR, XOR and flipflops like RS and JK. More complex
+components like AND, OR, XOR and flipflops like RS and JK. More complex
and reusable circuits can be built from sub-circuits.
-By default, the simulation is running permanently while building circuits.
+By default, the simulation is running permanently while building circuits.
Also available is a single stepping simulation to recognize peaks.
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/cad/klogic/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 22 Oct 2013 11:34:13 -0000 1.7
+++ pkg/PLIST 28 Apr 2017 19:30:11 -0000
@@ -1,129 +1,119 @@
@comment $OpenBSD: PLIST,v 1.7 2013/10/22 11:34:13 zhuk Exp $
-bin/klogic
-share/apps.kde3/
-share/apps.kde3/klogic/
-share/apps.kde3/klogic/klogicui.rc
-share/apps.kde3/klogic/pics/
-share/apps.kde3/klogic/pics/AND.xpm
-share/apps.kde3/klogic/pics/Bot.xpm
-share/apps.kde3/klogic/pics/BotBlank.xpm
-share/apps.kde3/klogic/pics/BotHuge.xpm
-share/apps.kde3/klogic/pics/BotLarge.xpm
-share/apps.kde3/klogic/pics/IEC_AND.xpm
-share/apps.kde3/klogic/pics/IEC_NOT.xpm
-share/apps.kde3/klogic/pics/IEC_OR.xpm
-share/apps.kde3/klogic/pics/IEC_XOR.xpm
-share/apps.kde3/klogic/pics/INV.xpm
-share/apps.kde3/klogic/pics/MONOFLOP.xpm
-share/apps.kde3/klogic/pics/Mid.xpm
-share/apps.kde3/klogic/pics/MidBlank.xpm
-share/apps.kde3/klogic/pics/MidHuge.xpm
-share/apps.kde3/klogic/pics/MidLarge.xpm
-share/apps.kde3/klogic/pics/NET.xpm
-share/apps.kde3/klogic/pics/OR.xpm
-share/apps.kde3/klogic/pics/OSC.xpm
-share/apps.kde3/klogic/pics/Subnet.xpm
-share/apps.kde3/klogic/pics/Top.xpm
-share/apps.kde3/klogic/pics/TopBlank.xpm
-share/apps.kde3/klogic/pics/TopHuge.xpm
-share/apps.kde3/klogic/pics/TopLarge.xpm
-share/apps.kde3/klogic/pics/XOR.xpm
-share/apps.kde3/klogic/pics/cursor.xpm
-share/apps.kde3/klogic/pics/pxD.xpm
-share/apps.kde3/klogic/pics/pxDM.xpm
-share/apps.kde3/klogic/pics/pxIN.xpm
-share/apps.kde3/klogic/pics/pxJK.xpm
-share/apps.kde3/klogic/pics/pxJKF.xpm
-share/apps.kde3/klogic/pics/pxLED0blue.xpm
-share/apps.kde3/klogic/pics/pxLED0green.xpm
-share/apps.kde3/klogic/pics/pxLED0red.xpm
-share/apps.kde3/klogic/pics/pxLED0yellow.xpm
-share/apps.kde3/klogic/pics/pxLED1blue.xpm
-share/apps.kde3/klogic/pics/pxLED1green.xpm
-share/apps.kde3/klogic/pics/pxLED1red.xpm
-share/apps.kde3/klogic/pics/pxLED1yellow.xpm
-share/apps.kde3/klogic/pics/pxNEG.xpm
-share/apps.kde3/klogic/pics/pxOUT.xpm
-share/apps.kde3/klogic/pics/pxPOS.xpm
-share/apps.kde3/klogic/pics/pxRS.xpm
-share/apps.kde3/klogic/pics/pxRSC.xpm
-share/apps.kde3/klogic/pics/pxRSCM.xpm
-share/apps.kde3/klogic/pics/pxRSCMF.xpm
-share/apps.kde3/klogic/pics/pxSS.xpm
-share/apps.kde3/klogic/pics/pxSSs0.xpm
-share/apps.kde3/klogic/pics/pxSSs1.xpm
-share/apps.kde3/klogic/pics/pxSSs10.xpm
-share/apps.kde3/klogic/pics/pxSSs11.xpm
-share/apps.kde3/klogic/pics/pxSSs12.xpm
-share/apps.kde3/klogic/pics/pxSSs13.xpm
-share/apps.kde3/klogic/pics/pxSSs14.xpm
-share/apps.kde3/klogic/pics/pxSSs15.xpm
-share/apps.kde3/klogic/pics/pxSSs2.xpm
-share/apps.kde3/klogic/pics/pxSSs3.xpm
-share/apps.kde3/klogic/pics/pxSSs4.xpm
-share/apps.kde3/klogic/pics/pxSSs5.xpm
-share/apps.kde3/klogic/pics/pxSSs6.xpm
-share/apps.kde3/klogic/pics/pxSSs7.xpm
-share/apps.kde3/klogic/pics/pxSSs8.xpm
-share/apps.kde3/klogic/pics/pxSSs9.xpm
-share/apps.kde3/klogic/pics/pxSSsoff.xpm
-share/apps.kde3/klogic/pics/pxSwitch0.xpm
-share/apps.kde3/klogic/pics/pxSwitch1.xpm
-share/apps.kde3/klogic/toolbar/
-share/apps.kde3/klogic/toolbar/tbAND.xpm
-share/apps.kde3/klogic/toolbar/tbBus.xpm
-share/apps.kde3/klogic/toolbar/tbD.xpm
-share/apps.kde3/klogic/toolbar/tbDev.xpm
-share/apps.kde3/klogic/toolbar/tbDraw.xpm
-share/apps.kde3/klogic/toolbar/tbFx.xpm
-share/apps.kde3/klogic/toolbar/tbIECAND.xpm
-share/apps.kde3/klogic/toolbar/tbIECINV.xpm
-share/apps.kde3/klogic/toolbar/tbIECOR.xpm
-share/apps.kde3/klogic/toolbar/tbIECXOR.xpm
-share/apps.kde3/klogic/toolbar/tbIN.xpm
-share/apps.kde3/klogic/toolbar/tbINV.xpm
-share/apps.kde3/klogic/toolbar/tbJK.xpm
-share/apps.kde3/klogic/toolbar/tbLED.xpm
-share/apps.kde3/klogic/toolbar/tbMatrix.xpm
-share/apps.kde3/klogic/toolbar/tbNET.xpm
-share/apps.kde3/klogic/toolbar/tbOR.xpm
-share/apps.kde3/klogic/toolbar/tbOSC.xpm
-share/apps.kde3/klogic/toolbar/tbOUT.xpm
-share/apps.kde3/klogic/toolbar/tbPWR.xpm
-share/apps.kde3/klogic/toolbar/tbRAM.xpm
-share/apps.kde3/klogic/toolbar/tbRS.xpm
-share/apps.kde3/klogic/toolbar/tbSS.xpm
-share/apps.kde3/klogic/toolbar/tbSWI.xpm
-share/apps.kde3/klogic/toolbar/tbSel.xpm
-share/apps.kde3/klogic/toolbar/tbShow.xpm
-share/apps.kde3/klogic/toolbar/tbSim.xpm
-share/apps.kde3/klogic/toolbar/tbStep.xpm
-share/apps.kde3/klogic/toolbar/tbTRI.xpm
-share/apps.kde3/klogic/toolbar/tbTXT.xpm
-share/apps.kde3/klogic/toolbar/tbUP.xpm
-share/apps.kde3/klogic/toolbar/tbXOR.xpm
-share/doc/HTML.kde3/
-share/doc/HTML.kde3/en/
-share/doc/HTML.kde3/en/klogic/
-share/doc/HTML.kde3/en/klogic/common
-share/doc/HTML.kde3/en/klogic/index.cache.bz2
-share/doc/HTML.kde3/en/klogic/index.docbook
-share/locale/
-share/locale/de/
-share/locale/de/LC_MESSAGES/
+@bin bin/klogic
+share/applications/kde4/klogic.desktop
+share/apps/klogic/
+share/apps/klogic/deviceIcons/
+share/apps/klogic/deviceIcons/AND.xpm
+share/apps/klogic/deviceIcons/Bot.xpm
+share/apps/klogic/deviceIcons/BotBlank.xpm
+share/apps/klogic/deviceIcons/BotHuge.xpm
+share/apps/klogic/deviceIcons/BotLarge.xpm
+share/apps/klogic/deviceIcons/IEC_AND.xpm
+share/apps/klogic/deviceIcons/IEC_NOT.xpm
+share/apps/klogic/deviceIcons/IEC_OR.xpm
+share/apps/klogic/deviceIcons/IEC_XOR.xpm
+share/apps/klogic/deviceIcons/INV.xpm
+share/apps/klogic/deviceIcons/MONOFLOP.xpm
+share/apps/klogic/deviceIcons/Mid.xpm
+share/apps/klogic/deviceIcons/MidBlank.xpm
+share/apps/klogic/deviceIcons/MidHuge.xpm
+share/apps/klogic/deviceIcons/MidLarge.xpm
+share/apps/klogic/deviceIcons/NET.xpm
+share/apps/klogic/deviceIcons/OR.xpm
+share/apps/klogic/deviceIcons/OSC.xpm
+share/apps/klogic/deviceIcons/Subnet.xpm
+share/apps/klogic/deviceIcons/Top.xpm
+share/apps/klogic/deviceIcons/TopBlank.xpm
+share/apps/klogic/deviceIcons/TopHuge.xpm
+share/apps/klogic/deviceIcons/TopLarge.xpm
+share/apps/klogic/deviceIcons/XOR.xpm
+share/apps/klogic/deviceIcons/cursor.xpm
+share/apps/klogic/deviceIcons/klogic.xpm
+share/apps/klogic/deviceIcons/klogicf.xpm
+share/apps/klogic/deviceIcons/pxD.xpm
+share/apps/klogic/deviceIcons/pxDM.xpm
+share/apps/klogic/deviceIcons/pxIN.xpm
+share/apps/klogic/deviceIcons/pxJK.xpm
+share/apps/klogic/deviceIcons/pxJKF.xpm
+share/apps/klogic/deviceIcons/pxLED0blue.xpm
+share/apps/klogic/deviceIcons/pxLED0green.xpm
+share/apps/klogic/deviceIcons/pxLED0red.xpm
+share/apps/klogic/deviceIcons/pxLED0yellow.xpm
+share/apps/klogic/deviceIcons/pxLED1blue.xpm
+share/apps/klogic/deviceIcons/pxLED1green.xpm
+share/apps/klogic/deviceIcons/pxLED1red.xpm
+share/apps/klogic/deviceIcons/pxLED1yellow.xpm
+share/apps/klogic/deviceIcons/pxMatrix.xpm
+share/apps/klogic/deviceIcons/pxNEG.xpm
+share/apps/klogic/deviceIcons/pxOUT.xpm
+share/apps/klogic/deviceIcons/pxPOS.xpm
+share/apps/klogic/deviceIcons/pxRS.xpm
+share/apps/klogic/deviceIcons/pxRSC.xpm
+share/apps/klogic/deviceIcons/pxRSCM.xpm
+share/apps/klogic/deviceIcons/pxRSCMF.xpm
+share/apps/klogic/deviceIcons/pxSS.xpm
+share/apps/klogic/deviceIcons/pxSSs0.xpm
+share/apps/klogic/deviceIcons/pxSSs1.xpm
+share/apps/klogic/deviceIcons/pxSSs10.xpm
+share/apps/klogic/deviceIcons/pxSSs11.xpm
+share/apps/klogic/deviceIcons/pxSSs12.xpm
+share/apps/klogic/deviceIcons/pxSSs13.xpm
+share/apps/klogic/deviceIcons/pxSSs14.xpm
+share/apps/klogic/deviceIcons/pxSSs15.xpm
+share/apps/klogic/deviceIcons/pxSSs2.xpm
+share/apps/klogic/deviceIcons/pxSSs3.xpm
+share/apps/klogic/deviceIcons/pxSSs4.xpm
+share/apps/klogic/deviceIcons/pxSSs5.xpm
+share/apps/klogic/deviceIcons/pxSSs6.xpm
+share/apps/klogic/deviceIcons/pxSSs7.xpm
+share/apps/klogic/deviceIcons/pxSSs8.xpm
+share/apps/klogic/deviceIcons/pxSSs9.xpm
+share/apps/klogic/deviceIcons/pxSSsoff.xpm
+share/apps/klogic/deviceIcons/pxSwitch0.xpm
+share/apps/klogic/deviceIcons/pxSwitch1.xpm
+share/apps/klogic/deviceIcons/pxTFF.xpm
+share/apps/klogic/klogic4ui.rc
+share/config.kcfg/klogic.kcfg
+share/icons/hicolor/16x16/apps/klogic4.png
+share/icons/hicolor/32x32/apps/klogic4-AutoStep.png
+share/icons/hicolor/32x32/apps/klogic4-FromLib.png
+share/icons/hicolor/32x32/apps/klogic4-Oscilloscope.png
+share/icons/hicolor/32x32/apps/klogic4-SingleStep.png
+share/icons/hicolor/32x32/apps/klogic4-SubUp.png
+share/icons/hicolor/32x32/apps/klogic4-fAND.png
+share/icons/hicolor/32x32/apps/klogic4-fBUS.png
+share/icons/hicolor/32x32/apps/klogic4-fCONNECT.png
+share/icons/hicolor/32x32/apps/klogic4-fDFF.png
+share/icons/hicolor/32x32/apps/klogic4-fEQUATION.png
+share/icons/hicolor/32x32/apps/klogic4-fIN.png
+share/icons/hicolor/32x32/apps/klogic4-fJK.png
+share/icons/hicolor/32x32/apps/klogic4-fLED.png
+share/icons/hicolor/32x32/apps/klogic4-fNAND.png
+share/icons/hicolor/32x32/apps/klogic4-fNOR.png
+share/icons/hicolor/32x32/apps/klogic4-fNOT.png
+share/icons/hicolor/32x32/apps/klogic4-fOR.png
+share/icons/hicolor/32x32/apps/klogic4-fOSC.png
+share/icons/hicolor/32x32/apps/klogic4-fOUT.png
+share/icons/hicolor/32x32/apps/klogic4-fPWR.png
+share/icons/hicolor/32x32/apps/klogic4-fRAM.png
+share/icons/hicolor/32x32/apps/klogic4-fRS.png
+share/icons/hicolor/32x32/apps/klogic4-fSELECT.png
+share/icons/hicolor/32x32/apps/klogic4-fSS.png
+share/icons/hicolor/32x32/apps/klogic4-fSUB.png
+share/icons/hicolor/32x32/apps/klogic4-fSWI.png
+share/icons/hicolor/32x32/apps/klogic4-fTFF.png
+share/icons/hicolor/32x32/apps/klogic4-fTRI.png
+share/icons/hicolor/32x32/apps/klogic4-fTXT.png
+share/icons/hicolor/32x32/apps/klogic4-fXOR.png
+share/icons/hicolor/32x32/apps/klogic4-library-maintenance.png
+share/icons/hicolor/32x32/apps/klogic4.png
+share/icons/hicolor/48x48/apps/klogic4.png
share/locale/de/LC_MESSAGES/klogic.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/klogic.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/klogic.mo
-share/locale/it/
-share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/klogic.mo
-share/locale/sv/
-share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/klogic.mo
-share/pixmaps/
-share/pixmaps/klogic.xpm
-share/pixmaps/klogicf.xpm
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
No comments:
Post a Comment