Typo in the last diff corrected: exmapls -> examples
Build/runs on my openbox system. Feedback/testing appreciated
Scott
On Aug 30, 2018: 18:46, Brian Callahan wrote:
On 08/30/18 00:23, Heppler, J. Scott wrote:
After I uploaded the v2 diff, it occurred to me that PKGNAME would not
be needed if I used the 16.6.1 tag.
The attached diff removes PKGNAME. Builds/Runs -current/amd64 openbox.
Scott
I think this is right. Though when I ran `make update-patches` one of
the patches got regen'd so it'll get committed with that little tweak.
Anyone want to give an ok?
~Brian
--
J. Scott Heppler
Penguin Innovations
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile 1 Jul 2018 18:33:39 -0000 1.10
+++ Makefile 5 Sep 2018 03:20:04 -0000
@@ -2,19 +2,15 @@
COMMENT= freedesktop-compliant panel
-V= 16.2
+V= 16.6.1
CATEGORIES= x11
-DISTNAME= tint2-$V
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST= ${WRKDIR}/tint2-v$V-b810bad93ff65854137fbd2f344ad2f99338008f
-REVISION= 2
-
+DISTNAME= tint2-${V}
HOMEPAGE= https://gitlab.com/o9000/tint2/
# GPLv2 only
PERMIT_PACKAGE_CDROM= YES
-MASTER_SITES= https://gitlab.com/o9000/tint2/repository/
+MASTER_SITES= https://gitlab.com/o9000/tint2/-/archive/${V}/
WANTLIB += Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 12 Mar 2018 22:49:54 -0000 1.3
+++ distinfo 5 Sep 2018 03:20:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.2.tar.gz) = OAvQGg7wIbcxqpzHFONIerz0mO6WFQ73J0BaAN8wuLI=
-SIZE (tint2-16.2.tar.gz) = 537236
+SHA256 (tint2-16.6.1.tar.gz) = 2S51My6+rDcPAntKCx6KCGUPxW4/KrxB9ROGNM9r180=
+SIZE (tint2-16.6.1.tar.gz) = 546488
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/x11/tint2/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 12 Mar 2018 22:49:54 -0000 1.2
+++ patches/patch-CMakeLists_txt 5 Sep 2018 03:20:04 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -288,7 +288,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+@@ -289,7 +289,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
install( TARGETS tint2 DESTINATION bin )
install( FILES tint2.svg DESTINATION
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
install( FILES tint2.desktop DESTINATION
${CMAKE_INSTALL_DATADIR}/applications )
Index: patches/patch-themes_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-themes_CMakeLists_txt
--- patches/patch-themes_CMakeLists_txt 12 Mar 2018 22:49:54 -0000 1.2
+++ patches/patch-themes_CMakeLists_txt 5 Sep 2018 03:20:04 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-themes_CMakeLists_txt,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
Index: themes/CMakeLists.txt
--- themes/CMakeLists.txt.orig
Index: patches/patch-themes_tint2rc
===================================================================
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_tint2rc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-themes_tint2rc
--- patches/patch-themes_tint2rc 12 Mar 2018 22:49:54 -0000 1.2
+++ patches/patch-themes_tint2rc 5 Sep 2018 03:20:04 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-themes_tint2rc,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
Index: themes/tint2rc
--- themes/tint2rc.orig
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 1 Jul 2018 18:33:39 -0000 1.6
+++ pkg/PLIST 5 Sep 2018 03:20:04 -0000
@@ -21,19 +21,22 @@ share/doc/tint2/tint2.md
share/examples/tint2/
@sample ${SYSCONFDIR}/xdg/
@sample ${SYSCONFDIR}/xdg/tint2/
-share/examples/tint2/horizontal-dark-opaque.tint2rc
-share/examples/tint2/horizontal-dark-transparent.tint2rc
-share/examples/tint2/horizontal-icon-only.tint2rc
-share/examples/tint2/horizontal-light-opaque.tint2rc
-share/examples/tint2/horizontal-light-transparent.tint2rc
-share/examples/tint2/horizontal-text-only.tint2rc
share/examples/tint2/tint2rc
@sample ${SYSCONFDIR}/xdg/tint2/tint2rc
-share/examples/tint2/vertical-dark-opaque.tint2rc
-share/examples/tint2/vertical-dark-transparent.tint2rc
-share/examples/tint2/vertical-light-opaque.tint2rc
-share/examples/tint2/vertical-light-transparent.tint2rc
-share/examples/tint2/vertical-neutral-icons.tint2rc
+share/exampls/
+share/exampls/tint2/
+share/exampls/tint2/horizontal-dark-opaque.tint2rc
+share/exampls/tint2/horizontal-dark-transparent.tint2rc
+share/exampls/tint2/horizontal-icon-only.tint2rc
+share/exampls/tint2/horizontal-light-opaque.tint2rc
+share/exampls/tint2/horizontal-light-transparent.tint2rc
+share/exampls/tint2/horizontal-text-only.tint2rc
+share/exampls/tint2/tint2rc
+share/exampls/tint2/vertical-dark-opaque.tint2rc
+share/exampls/tint2/vertical-dark-transparent.tint2rc
+share/exampls/tint2/vertical-light-opaque.tint2rc
+share/exampls/tint2/vertical-light-transparent.tint2rc
+share/exampls/tint2/vertical-neutral-icons.tint2rc
share/icons/hicolor/scalable/apps/tint2.svg
share/icons/hicolor/scalable/apps/tint2conf.svg
share/locale/bs/LC_MESSAGES/tint2conf.mo
