pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Fix embarassingly mistyped package name.



Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Thu Dec 22 08:41:13 2022 +0100
Changeset:	a3f6cc9e4a81825827d392d074b174a22e598425

Modified Files:
	Makefile
Added Files:
	libgnuregex/DESCR
	libgnuregex/Makefile
	libgnuregex/PLIST
	libgnuregex/distinfo
	libgnuregex/patches/patch-Makefile.in
Removed Files:
	libgenuregex/DESCR
	libgenuregex/Makefile
	libgenuregex/PLIST
	libgenuregex/distinfo
	libgenuregex/patches/patch-Makefile.in

Log Message:
Fix embarassingly mistyped package name.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a3f6cc9e4a81825827d392d074b174a22e598425

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                               |  1 +
 libgenuregex/DESCR                     |  5 -----
 libgenuregex/Makefile                  | 34 ----------------------------------
 libgenuregex/PLIST                     |  3 ---
 libgenuregex/distinfo                  |  6 ------
 libgenuregex/patches/patch-Makefile.in | 23 -----------------------
 libgnuregex/DESCR                      |  5 +++++
 libgnuregex/Makefile                   | 34 ++++++++++++++++++++++++++++++++++
 libgnuregex/PLIST                      |  3 +++
 libgnuregex/distinfo                   |  6 ++++++
 libgnuregex/patches/patch-Makefile.in  | 23 +++++++++++++++++++++++
 11 files changed, 72 insertions(+), 71 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 24e3974b72..d7c99f1395 100644
--- a/Makefile
+++ b/Makefile
@@ -2108,6 +2108,7 @@ SUBDIR+=	libglade-java
 SUBDIR+=	libgnome-java
 SUBDIR+=	libgnome-keyring
 SUBDIR+=	libgnomekbd
+SUBDIR+=	libgnuregex
 SUBDIR+=	libgraphqlparser
 SUBDIR+=	libgrass5
 SUBDIR+=	libgravatar
diff --git a/libgenuregex/DESCR b/libgenuregex/DESCR
deleted file mode 100644
index 8d11bce8cb..0000000000
--- a/libgenuregex/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-GNU Regex is the regex subset of Gnulib, the GNU portability library.
-It offers an extension of the regex(3) API to allow more flexibility
-in the flavor of regular expressions.
-The GNU regex library is compliant with POSIX.2, except for
-internationalization features.
diff --git a/libgenuregex/Makefile b/libgenuregex/Makefile
deleted file mode 100644
index 29edc88fd3..0000000000
--- a/libgenuregex/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	regex-0.12
-PKGNAME=	${DISTNAME:S/^/libgnu/}
-CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.gnu.org/old-gnu/regex/
-
-MAINTAINER=	vins%NetBSD.org@localhost
-HOMEPAGE=	https://directory.fsf.org/wiki/Regex
-COMMENT=	GNU Regex library
-LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
-
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-
-LIB=	libgnuregex.la
-INC=	gnuregex.h
-
-MAKE_FLAGS+=	CC=${CC:Q}
-MAKE_FLAGS+=	SHELL=${SH:Q}
-MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
-MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
-MAKE_FLAGS+=	subdirs=
-
-INSTALLATION_DIRS=	${PREFIX}/include ${PREFIX}/lib
-
-do-install:
-	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/${LIB} 	\
-		${DESTDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/${INC:S/gnu//} 			\
-		${DESTDIR}${PREFIX}/include/${INC}
-
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/libgenuregex/PLIST b/libgenuregex/PLIST
deleted file mode 100644
index bd428c68bd..0000000000
--- a/libgenuregex/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-include/gnuregex.h
-lib/libgnuregex.la
diff --git a/libgenuregex/distinfo b/libgenuregex/distinfo
deleted file mode 100644
index e3d4889ebd..0000000000
--- a/libgenuregex/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-BLAKE2s (regex-0.12.tar.gz) = c372aeb7906d9b6c626656b2af02e22619446ef5cc669a5076a60eb49964ecb4
-SHA512 (regex-0.12.tar.gz) = 85a4f5161759646b3cf5484539cebe92e51ee1896f7853084d4aba2b5399164922103dc2b49971eca9821bec56195fef999f100f61b6d734955ccd7c81ca3ca7
-Size (regex-0.12.tar.gz) = 297790 bytes
-SHA1 (patch-Makefile.in) = 100748772d017efb9fa17951ccf3669b97078205
diff --git a/libgenuregex/patches/patch-Makefile.in b/libgenuregex/patches/patch-Makefile.in
deleted file mode 100644
index c39d4b5b9d..0000000000
--- a/libgenuregex/patches/patch-Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-Use libtool to build shared ojects.
-
---- Makefile.in.orig	1993-04-02 23:12:15.000000000 +0000
-+++ Makefile.in
-@@ -45,11 +45,14 @@ SHELL = /bin/sh
- 
- subdirs = doc test
- 
--default all:: regex.o
-+default all:: libgnuregex.a regex.o
- .PHONY: default all
- 
-+libgnuregex.a: regex.o
-+	${LIBTOOL} --mode=link --tag=CC ${CC} -o ${.TARGET:.a=.la} ${regex.o:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:12
-+
- regex.o: regex.c regex.h
--	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) -c $<
-+	${LIBTOOL} --mode=compile --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) -c $<
- 
- clean mostlyclean::
- 	rm -f *.o
diff --git a/libgnuregex/DESCR b/libgnuregex/DESCR
new file mode 100644
index 0000000000..8d11bce8cb
--- /dev/null
+++ b/libgnuregex/DESCR
@@ -0,0 +1,5 @@
+GNU Regex is the regex subset of Gnulib, the GNU portability library.
+It offers an extension of the regex(3) API to allow more flexibility
+in the flavor of regular expressions.
+The GNU regex library is compliant with POSIX.2, except for
+internationalization features.
diff --git a/libgnuregex/Makefile b/libgnuregex/Makefile
new file mode 100644
index 0000000000..29edc88fd3
--- /dev/null
+++ b/libgnuregex/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD$
+
+DISTNAME=	regex-0.12
+PKGNAME=	${DISTNAME:S/^/libgnu/}
+CATEGORIES=	devel
+MASTER_SITES=	ftp://ftp.gnu.org/old-gnu/regex/
+
+MAINTAINER=	vins%NetBSD.org@localhost
+HOMEPAGE=	https://directory.fsf.org/wiki/Regex
+COMMENT=	GNU Regex library
+LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
+
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+
+LIB=	libgnuregex.la
+INC=	gnuregex.h
+
+MAKE_FLAGS+=	CC=${CC:Q}
+MAKE_FLAGS+=	SHELL=${SH:Q}
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
+MAKE_FLAGS+=	subdirs=
+
+INSTALLATION_DIRS=	${PREFIX}/include ${PREFIX}/lib
+
+do-install:
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/${LIB} 	\
+		${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/${INC:S/gnu//} 			\
+		${DESTDIR}${PREFIX}/include/${INC}
+
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/libgnuregex/PLIST b/libgnuregex/PLIST
new file mode 100644
index 0000000000..bd428c68bd
--- /dev/null
+++ b/libgnuregex/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+include/gnuregex.h
+lib/libgnuregex.la
diff --git a/libgnuregex/distinfo b/libgnuregex/distinfo
new file mode 100644
index 0000000000..e3d4889ebd
--- /dev/null
+++ b/libgnuregex/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+BLAKE2s (regex-0.12.tar.gz) = c372aeb7906d9b6c626656b2af02e22619446ef5cc669a5076a60eb49964ecb4
+SHA512 (regex-0.12.tar.gz) = 85a4f5161759646b3cf5484539cebe92e51ee1896f7853084d4aba2b5399164922103dc2b49971eca9821bec56195fef999f100f61b6d734955ccd7c81ca3ca7
+Size (regex-0.12.tar.gz) = 297790 bytes
+SHA1 (patch-Makefile.in) = 100748772d017efb9fa17951ccf3669b97078205
diff --git a/libgnuregex/patches/patch-Makefile.in b/libgnuregex/patches/patch-Makefile.in
new file mode 100644
index 0000000000..c39d4b5b9d
--- /dev/null
+++ b/libgnuregex/patches/patch-Makefile.in
@@ -0,0 +1,23 @@
+$NetBSD$
+
+Use libtool to build shared ojects.
+
+--- Makefile.in.orig	1993-04-02 23:12:15.000000000 +0000
++++ Makefile.in
+@@ -45,11 +45,14 @@ SHELL = /bin/sh
+ 
+ subdirs = doc test
+ 
+-default all:: regex.o
++default all:: libgnuregex.a regex.o
+ .PHONY: default all
+ 
++libgnuregex.a: regex.o
++	${LIBTOOL} --mode=link --tag=CC ${CC} -o ${.TARGET:.a=.la} ${regex.o:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:12
++
+ regex.o: regex.c regex.h
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) -c $<
++	${LIBTOOL} --mode=compile --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) -c $<
+ 
+ clean mostlyclean::
+ 	rm -f *.o


Home | Main Index | Thread Index | Old Index