gitglk: remove git to gitglk to match PKGNAME.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gitglk: remove git to gitglk to match PKGNAME.
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Sun, 22 May 2016 17:54:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun May 22 19:54:52 2016 +0200
Changeset:	6f35f3b3bbac19d589f8b02848936a770bbde306

Modified Files:
	Makefile
Added Files:
	glkgit/DESCR
	glkgit/Makefile
	glkgit/PLIST
	glkgit/TODO
	glkgit/distinfo
	glkgit/patches/patch-aa
Removed Files:
	git/DESCR
	git/Makefile
	git/PLIST
	git/TODO
	git/distinfo
	git/patches/patch-aa

Log Message:
gitglk: remove git to gitglk to match PKGNAME.

While here, sync and sort Makefile.

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

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

diffstat:
 Makefile                | 10 ++++++----
 git/DESCR               |  4 ----
 git/Makefile            | 27 -------------------------
 git/PLIST               |  2 --
 git/TODO                |  5 -----
 git/distinfo            |  6 ------
 git/patches/patch-aa    | 53 -------------------------------------------------
 glkgit/DESCR            |  4 ++++
 glkgit/Makefile         | 27 +++++++++++++++++++++++++
 glkgit/PLIST            |  2 ++
 glkgit/TODO             |  5 +++++
 glkgit/distinfo         |  6 ++++++
 glkgit/patches/patch-aa | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 13 files changed, 103 insertions(+), 101 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 0d7ac90..6518c56 100644
--- a/Makefile
+++ b/Makefile
@@ -873,7 +873,6 @@ SUBDIR+=	giggle
 SUBDIR+=	gimmie
 SUBDIR+=	gimp-dds
 SUBDIR+=	gin
-SUBDIR+=	git
 SUBDIR+=	git-docs-html
 SUBDIR+=	git-modes-git
 SUBDIR+=	gitg
@@ -890,6 +889,7 @@ SUBDIR+=	glibc
 SUBDIR+=	glide3
 SUBDIR+=	glimmerm
 SUBDIR+=	glista
+SUBDIR+=	glkgit
 SUBDIR+=	glkloader
 SUBDIR+=	glkterm
 SUBDIR+=	globulation2
@@ -907,7 +907,6 @@ SUBDIR+=	gnocchi
 SUBDIR+=	gnochm
 SUBDIR+=	gnokii
 SUBDIR+=	gnomad2
-SUBDIR+=	gnome3
 SUBDIR+=	gnome-activity-journal
 SUBDIR+=	gnome-alsamixer
 SUBDIR+=	gnome-applets
@@ -930,6 +929,8 @@ SUBDIR+=	gnome-panel
 SUBDIR+=	gnome-session
 SUBDIR+=	gnome-settings-daemon
 SUBDIR+=	gnome-terminal
+SUBDIR+=	gnome-tracker
+SUBDIR+=	gnome3
 SUBDIR+=	gnomebaker
 SUBDIR+=	gnomeradio
 SUBDIR+=	gnormalize
@@ -1507,8 +1508,8 @@ SUBDIR+=	kibana
 SUBDIR+=	kiconthemes
 SUBDIR+=	kidletime
 SUBDIR+=	kimageformats
-SUBDIR+=	kinit
 SUBDIR+=	kinfocenter
+SUBDIR+=	kinit
 SUBDIR+=	kino
 SUBDIR+=	kio
 SUBDIR+=	kio-extras
@@ -1802,7 +1803,6 @@ SUBDIR+=	lumina
 SUBDIR+=	lumina-i18n
 SUBDIR+=	lwc
 SUBDIR+=	lxappearance
-SUBDIR+=	lxappearance-obconf
 SUBDIR+=	lxde
 SUBDIR+=	lxde-common
 SUBDIR+=	lxde-icon-theme
@@ -3659,6 +3659,7 @@ SUBDIR+=	qt4-gstreamer
 SUBDIR+=	qt4-libqtlua
 SUBDIR+=	qt5-libqtlua
 SUBDIR+=	qt5-qscintilla
+SUBDIR+=	qt5-qtbase-git
 SUBDIR+=	qtaccountsservice
 SUBDIR+=	qtcreator
 SUBDIR+=	qtcurve-gtk2
@@ -3849,6 +3850,7 @@ SUBDIR+=	silvertree
 SUBDIR+=	sim-kde
 SUBDIR+=	sim-qt
 SUBDIR+=	simgear
+SUBDIR+=	simgrid
 SUBDIR+=	simpa
 SUBDIR+=	simple-scan
 SUBDIR+=	simplec
diff --git a/git/DESCR b/git/DESCR
deleted file mode 100644
index e5acced..0000000
--- a/git/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Git is an interpreter for the Glulx virtual machine. Its main
-goal in life is to be fast. It's about five times faster than
-Glulxe, and about twice as fast as Frotz (using the same Inform
-source compiled for the Z-machine).
diff --git a/git/Makefile b/git/Makefile
deleted file mode 100644
index 8344825..0000000
--- a/git/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2012/12/12 10:44:37 thomasklausner Exp $
-#
-
-DISTNAME=		git-110
-PKGNAME=		glkgit-1.1.0
-CATEGORIES=		games
-MASTER_SITES=		http://diden.net/if/git/releases/
-EXTRACT_SUFX=		.zip
-
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		http://diden.net/if/git/
-COMMENT=		Interpreter for Glulx interactive fiction
-
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/glk//}
-MAKE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR:Q}
-
-INSTALLATION_DIRS+=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/git ${DESTDIR}${PREFIX}/bin/glkgit
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.glkgit
-.include "../../wip/glkloader/glk-options.mk"
-.include "../../mk/bsd.options.mk"
-.include "../../wip/glkloader/glk-depends.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/git/PLIST b/git/PLIST
deleted file mode 100644
index 9ae34fc..0000000
--- a/git/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2008/03/04 12:46:12 hoka_adam Exp $
-bin/glkgit
diff --git a/git/TODO b/git/TODO
deleted file mode 100644
index 8d87c4e..0000000
--- a/git/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-Should be imported as glkgit if ready.
-
-Doesn't work on 4.99.55:
-  Program terminated with signal 11, Segmentation fault.
-  #0  0xbbb61d97 in _malloc_prefork () from /usr/lib/libc.so.12
diff --git a/git/distinfo b/git/distinfo
deleted file mode 100644
index ff7d3df..0000000
--- a/git/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/03/07 15:24:22 dillo Exp $
-
-SHA1 (git-110.zip) = b7ec9196f2f155d5f23eefe9be6b4a7587b36110
-RMD160 (git-110.zip) = b968540a22ff484deb01a0cfb145086ec74eef74
-Size (git-110.zip) = 76928 bytes
-SHA1 (patch-aa) = 30f21ee0d8caf26ba05b314186c45c83c0dd8b33
diff --git a/git/patches/patch-aa b/git/patches/patch-aa
deleted file mode 100644
index fb366da..0000000
--- a/git/patches/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/03/07 15:24:23 dillo Exp $
-
---- Makefile.orig	2004-12-22 15:34:43.000000000 +0100
-+++ Makefile
-@@ -9,16 +9,16 @@ GLK = cheapglk
- #GLK = glkterm
- #GLK = xglk
- 
--GLKINCLUDEDIR = ../$(GLK)
--GLKLIBDIR = ../$(GLK)
--GLKMAKEFILE = Make.$(GLK)
-+GLKINCLUDEDIR = $(PREFIX)/include/glk
-+GLKLIBDIR = $(PREFIX)/lib
-+GLKMAKEFILE = Make.glk
- 
- # -----------------------------------------------------------------
- # Step 2: pick a C compiler.
- 
- # Generic C compiler
--CC = cc -O2
--OPTIONS =
-+#CC = cc -O2
-+OPTIONS =-rdynamic
- 
- # Best settings for GCC 2.95. This generates faster code than
- # GCC 3, so you should use this setup if possible.
-@@ -37,7 +37,7 @@ OPTIONS =
- # -----------------------------------------------------------------
- # Step 3: decide where you want to install the compiled executable.
- 
--INSTALLDIR = /usr/local/bin
-+INSTALLDIR = $(PREFIX)/bin
- 
- # -----------------------------------------------------------------
- # You shouldn't have to change anything from here on down.
-@@ -46,7 +46,7 @@ MAJOR = 1
- MINOR = 1
- PATCH = 0
- 
--include $(GLKINCLUDEDIR)/$(GLKMAKEFILE)
-+include $(BUILDLINK_DIR)/include/glk/$(GLKMAKEFILE)
- 
- CFLAGS = $(OPTIONS) -I$(GLKINCLUDEDIR)
- 
-@@ -69,7 +69,7 @@ git: $(OBJS)
- 	$(CC) $(OPTIONS) -o git $(OBJS) $(LIBS)
- 
- install: git
--	cp git $(INSTALLDIR)/git
-+	$(BSD_INSTALL_PROGRAM) git $(INSTALLDIR)/git
- 
- clean:
- 	rm -f *~ *.o git
diff --git a/glkgit/DESCR b/glkgit/DESCR
new file mode 100644
index 0000000..e5acced
--- /dev/null
+++ b/glkgit/DESCR
@@ -0,0 +1,4 @@
+Git is an interpreter for the Glulx virtual machine. Its main
+goal in life is to be fast. It's about five times faster than
+Glulxe, and about twice as fast as Frotz (using the same Inform
+source compiled for the Z-machine).
diff --git a/glkgit/Makefile b/glkgit/Makefile
new file mode 100644
index 0000000..8344825
--- /dev/null
+++ b/glkgit/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.10 2012/12/12 10:44:37 thomasklausner Exp $
+#
+
+DISTNAME=		git-110
+PKGNAME=		glkgit-1.1.0
+CATEGORIES=		games
+MASTER_SITES=		http://diden.net/if/git/releases/
+EXTRACT_SUFX=		.zip
+
+MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=		http://diden.net/if/git/
+COMMENT=		Interpreter for Glulx interactive fiction
+
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/glk//}
+MAKE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+
+INSTALLATION_DIRS+=	bin
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/git ${DESTDIR}${PREFIX}/bin/glkgit
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.glkgit
+.include "../../wip/glkloader/glk-options.mk"
+.include "../../mk/bsd.options.mk"
+.include "../../wip/glkloader/glk-depends.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/glkgit/PLIST b/glkgit/PLIST
new file mode 100644
index 0000000..9ae34fc
--- /dev/null
+++ b/glkgit/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.2 2008/03/04 12:46:12 hoka_adam Exp $
+bin/glkgit
diff --git a/glkgit/TODO b/glkgit/TODO
new file mode 100644
index 0000000..8d87c4e
--- /dev/null
+++ b/glkgit/TODO
@@ -0,0 +1,5 @@
+Should be imported as glkgit if ready.
+
+Doesn't work on 4.99.55:
+  Program terminated with signal 11, Segmentation fault.
+  #0  0xbbb61d97 in _malloc_prefork () from /usr/lib/libc.so.12
diff --git a/glkgit/distinfo b/glkgit/distinfo
new file mode 100644
index 0000000..ff7d3df
--- /dev/null
+++ b/glkgit/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.3 2005/03/07 15:24:22 dillo Exp $
+
+SHA1 (git-110.zip) = b7ec9196f2f155d5f23eefe9be6b4a7587b36110
+RMD160 (git-110.zip) = b968540a22ff484deb01a0cfb145086ec74eef74
+Size (git-110.zip) = 76928 bytes
+SHA1 (patch-aa) = 30f21ee0d8caf26ba05b314186c45c83c0dd8b33
diff --git a/glkgit/patches/patch-aa b/glkgit/patches/patch-aa
new file mode 100644
index 0000000..fb366da
--- /dev/null
+++ b/glkgit/patches/patch-aa
@@ -0,0 +1,53 @@
+$NetBSD: patch-aa,v 1.3 2005/03/07 15:24:23 dillo Exp $
+
+--- Makefile.orig	2004-12-22 15:34:43.000000000 +0100
++++ Makefile
+@@ -9,16 +9,16 @@ GLK = cheapglk
+ #GLK = glkterm
+ #GLK = xglk
+ 
+-GLKINCLUDEDIR = ../$(GLK)
+-GLKLIBDIR = ../$(GLK)
+-GLKMAKEFILE = Make.$(GLK)
++GLKINCLUDEDIR = $(PREFIX)/include/glk
++GLKLIBDIR = $(PREFIX)/lib
++GLKMAKEFILE = Make.glk
+ 
+ # -----------------------------------------------------------------
+ # Step 2: pick a C compiler.
+ 
+ # Generic C compiler
+-CC = cc -O2
+-OPTIONS =
++#CC = cc -O2
++OPTIONS =-rdynamic
+ 
+ # Best settings for GCC 2.95. This generates faster code than
+ # GCC 3, so you should use this setup if possible.
+@@ -37,7 +37,7 @@ OPTIONS =
+ # -----------------------------------------------------------------
+ # Step 3: decide where you want to install the compiled executable.
+ 
+-INSTALLDIR = /usr/local/bin
++INSTALLDIR = $(PREFIX)/bin
+ 
+ # -----------------------------------------------------------------
+ # You shouldn't have to change anything from here on down.
+@@ -46,7 +46,7 @@ MAJOR = 1
+ MINOR = 1
+ PATCH = 0
+ 
+-include $(GLKINCLUDEDIR)/$(GLKMAKEFILE)
++include $(BUILDLINK_DIR)/include/glk/$(GLKMAKEFILE)
+ 
+ CFLAGS = $(OPTIONS) -I$(GLKINCLUDEDIR)
+ 
+@@ -69,7 +69,7 @@ git: $(OBJS)
+ 	$(CC) $(OPTIONS) -o git $(OBJS) $(LIBS)
+ 
+ install: git
+-	cp git $(INSTALLDIR)/git
++	$(BSD_INSTALL_PROGRAM) git $(INSTALLDIR)/git
+ 
+ clean:
+ 	rm -f *~ *.o git
Prev by Date: Sync Makefile.
Next by Date: mate-icon-theme-faenza: remove, imported in pkgsrc.
Previous by Thread: uTox-git: Update wip/uTox-git to 0.9.0
Next by Thread: mate-icon-theme-faenza: remove, imported in pkgsrc.
Indexes:
Home | Main Index | Thread Index | Old Index