Here is an update for wmtime to 0.4. The main change is that it uses
libdockapp now.
Port-wise:
- drop wmgeneral stuff (it's in libdockapp)
- remove the upstream Makefile patch, explaining that ours expanded
- once again, i had to add libconv flags
Testing:
This builds and works fine on macppc and amd64.
OK?
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wmtime/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile 12 Jul 2019 21:02:30 -0000 1.19
+++ Makefile 4 Feb 2021 19:38:09 -0000
@@ -2,23 +2,32 @@
COMMENT= time/date applet for WindowMaker
-DISTNAME= wmtime-1.0b2
-REVISION= 2
+DISTNAME= wmtime-1.4
CATEGORIES= x11 x11/windowmaker
+HOMEPAGE= https://www.dockapps.net/wmtime
+
# GPL
PERMIT_PACKAGE= Yes
-WANTLIB= X11 Xext Xpm c m
+WANTLIB += X11 Xext Xpm c dockapp iconv m
-MASTER_SITES= http://mirror2.unixfreunde.de/ \
- http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
+MASTER_SITES= https://www.dockapps.net/download/
-MAKE_FLAGS= CC="${CC}"
+LIB_DEPENDS= converters/libiconv \
+ devel/libdockapp>=0.7.3
-WRKDIST= ${WRKDIR}/wmtime.app
-WRKSRC= ${WRKDIST}/wmtime
+MAKE_FLAGS+= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ MANDIR="${PREFIX}/man/man1"
NO_TEST= Yes
+
+CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include
+
+LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib -liconv
+
+WRKDIST= ${WRKDIR}/dockapps-7d1ef92
+
+ALL_TARGET+= wmtime
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/wmtime/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:16:04 -0000 1.4
+++ distinfo 4 Feb 2021 19:38:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (wmtime-1.0b2.tar.gz) = +6R8IM7ej5d73TzB5Rs+1su1Tx1oAi2Q+cSnDBVynZY=
-SIZE (wmtime-1.0b2.tar.gz) = 20680
+SHA256 (wmtime-1.4.tar.gz) = lY/qJBAAlJ755JK950FQlVLdw6mbSyhd2e7XkDVTQ5Y=
+SIZE (wmtime-1.4.tar.gz) = 19045
Index: patches/patch-wmgeneral_list_h
===================================================================
RCS file: patches/patch-wmgeneral_list_h
diff -N patches/patch-wmgeneral_list_h
--- patches/patch-wmgeneral_list_h 5 May 2017 13:48:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-wmgeneral_list_h,v 1.1 2017/05/05 13:48:23 jca Exp $
-
-Index: wmgeneral/list.h
---- wmgeneral/list.h.orig
-+++ wmgeneral/list.h
-@@ -29,9 +29,7 @@ Boston, MA 02111-1307, USA. */
- #ifndef __LIST_H_
- #define __LIST_H_
-
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
-+#if 1
- # define INLINE
-
No comments:
Post a Comment