Hi,
Here is an update for an to 1.2. This is a rewrite with several
bugfixes, icu support and less bloat (the library has been
removed).
I don't have much to say port-wise, changes are trivial - i took the
opportunity to reorder the Makefile per Makefile.template since it
doesn't affect much the diff readability. Also, i've zapped some of
our hooks since upstream's Makefile has now friendlier targets.
This has been tested on amd64, macppc (with clang and gcc there)
successfully.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/an/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile 12 Jul 2019 20:46:14 -0000 1.20
+++ Makefile 7 Oct 2020 13:18:39 -0000
@@ -2,31 +2,32 @@
COMMENT= fast anagram generator
-V= 0.95
+V= 1.2
DISTNAME= an_${V}.orig
PKGNAME= an-${V}
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_DEBIAN:=main/a/an/}
-# GPL - LGPL
+# GPLv2+
PERMIT_PACKAGE= Yes
-WANTLIB= c
+HOMEPAGE= https://salsa.debian.org/pm/an
-WRKDIST= ${WRKDIR}/an-${V}
+WANTLIB= c icudata icui18n icuuc
+
+MASTER_SITES= ${MASTER_SITE_DEBIAN:=main/a/an/}
+
+LIB_DEPENDS= textproc/icu4c,-main
+
+FAKE_FLAGS= DESTDIR=${WRKINST}${PREFIX}
NO_TEST= Yes
+USE_GMAKE= Yes
+
+WRKDIST= ${WRKDIR}/an-${V}
+
pre-configure:
@perl -pi -e 's,/usr/dict/words,/usr/share/dict/words,g' \
${WRKSRC}/an.6
-
-do-build:
- cd ${WRKBUILD} && \
- ${CC} ${CFLAGS} an.c gan_qsort.c -o an ${LDFLAGS}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/an ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKBUILD}/an.6 ${PREFIX}/man/man6
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/an/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 18 Jan 2015 03:13:55 -0000 1.5
+++ distinfo 7 Oct 2020 13:18:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (an_0.95.orig.tar.gz) = ESZt0eNHWU2Y+N/R4UHYtPvgZ3UlQtDpPEIsR4n5KVw=
-SIZE (an_0.95.orig.tar.gz) = 47829
+SHA256 (an_1.2.orig.tar.gz) = uBqNt0zf3znmyn3XUs9HIkNdL7f7OhuXHU9PrlFC2ys=
+SIZE (an_1.2.orig.tar.gz) = 14231
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile 7 Oct 2020 13:18:39 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -16,10 +16,10 @@
+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+-INSTALLDIR := $(DESTDIR)/usr/games
+-MANDIR := $(DESTDIR)/usr/share/man/man6
++INSTALLDIR := $(DESTDIR)/bin
++MANDIR := $(DESTDIR)/man/man6
+
+-CC:=gcc
++CC?=gcc
+ INSTALL:=install
+
+ CFLAGS += $(shell icu-config --cflags)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/an/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 15 Sep 2004 00:46:08 -0000 1.3
+++ pkg/PLIST 7 Oct 2020 13:18:39 -0000
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:46:08 espie Exp $
-bin/an
+@bin bin/an
@man man/man6/an.6
