Date: Thu, 12 Dec 2019 14:44:17 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519929 - in head/games/wizznic: . files Message-ID: <201912121444.xBCEiHDM033228@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Dec 12 14:44:17 2019 New Revision: 519929 URL: https://svnweb.freebsd.org/changeset/ports/519929 Log: - Update to 380 - Take maintainership Added: head/games/wizznic/files/patch-Makefile.linux (contents, props changed) head/games/wizznic/files/patch-src_bundle.c (contents, props changed) Deleted: head/games/wizznic/files/patch-Makefile head/games/wizznic/pkg-plist Modified: head/games/wizznic/Makefile head/games/wizznic/distinfo Modified: head/games/wizznic/Makefile ============================================================================== --- head/games/wizznic/Makefile Thu Dec 12 14:23:40 2019 (r519928) +++ head/games/wizznic/Makefile Thu Dec 12 14:44:17 2019 (r519929) @@ -2,39 +2,46 @@ # $FreeBSD$ PORTNAME= wizznic -PORTVERSION= 0.9.9 -DISTVERSIONSUFFIX=-src -PORTREVISION= 7 +PORTVERSION= 380 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Source%20Releases/ +DISTNAME= Wizznic_src_build_${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= amdmi3@FreeBSD.org COMMENT= Implementation of the arcade classic Puzznic LICENSE= GPLv3+ LIB_DEPENDS= libpng.so:graphics/png -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src - USES= gmake sdl tar:bzip2 -USE_CSTD= gnu89 USE_SDL= image mixer sdl -MAKE_ENV= DATADIR=${DATADIR}/ BINDIR=${PREFIX}/bin -ALL_TARGET= sdl +MAKE_ENV= DATADIR=${DATADIR}/ +MAKEFILE= Makefile.linux -PORTDOCS= changelog.txt credits.txt music-score-credits.txt readme.txt +PORTDOCS= * +PORTDATA= * +PLIST_FILES= bin/wizznic man/man6/wizznic.6.gz -DESKTOP_ENTRIES="Wizznic!" "${COMMENT}" ${PORTNAME} \ +DESKTOP_ENTRIES="Wizznic!" "" "${DATADIR}/packs/001_wizznic/icon.png" \ "${PORTNAME}" "Game;LogicGame;" false -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= OPENGL DOCS +OPTIONS_DEFAULT=OPENGL +OPENGL_USES= gl +OPENGL_USE= GL=gl +OPENGL_MAKE_ENV_OFF= WITH_OPENGL=false -post-install: - @${CHMOD} -R 755 ${STAGEDIR}${DATADIR} +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/wizznic ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC} && ${COPYTREE_SHARE} "data packs" ${STAGEDIR}${DATADIR} + ${INSTALL_MAN} ${WRKSRC}/doc/wizznic.6 ${STAGEDIR}${MAN6PREFIX}/man/man6 + +do-insall-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} - ${LN} -sf ${DATADIR}/packs/001_wizznic/icon.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/ +.for f in changelog.txt credits.txt music-score-credits.txt ports.txt readme.txt + ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${STAGEDIR}${DOCSDIR}/ +.endfor .include <bsd.port.mk> Modified: head/games/wizznic/distinfo ============================================================================== --- head/games/wizznic/distinfo Thu Dec 12 14:23:40 2019 (r519928) +++ head/games/wizznic/distinfo Thu Dec 12 14:44:17 2019 (r519929) @@ -1,2 +1,3 @@ -SHA256 (wizznic-0.9.9-src.tar.bz2) = 2cf9462177474d7f5bfe95bbc21303ec7031ca86412b587b5e7d3ed531d5b16b -SIZE (wizznic-0.9.9-src.tar.bz2) = 17311313 +TIMESTAMP = 1576003538 +SHA256 (Wizznic_src_build_380.tar.bz2) = 5055626a14819e149b6c5343cb46acb83c5f480f566137fa7c32a23cb25fbf74 +SIZE (Wizznic_src_build_380.tar.bz2) = 38117809 Added: head/games/wizznic/files/patch-Makefile.linux ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/wizznic/files/patch-Makefile.linux Thu Dec 12 14:44:17 2019 (r519929) @@ -0,0 +1,51 @@ +--- Makefile.linux.orig 2016-02-16 19:47:56 UTC ++++ Makefile.linux +@@ -2,7 +2,7 @@ + #To make a system-wide install add DATADIR=/dir/to/data/ and BINDIR=/dir/to/bin/ to the make command + #To compile without OpenGL scaling support, add WITH_OPENGL=false to the make command. + +-CC = gcc ++CC ?= gcc + LD = $(CC) + STRIP = strip + MAKE = make +@@ -19,7 +19,7 @@ DEFS = -DDATADIR="\"$(DATADIR)\"" -D_DEFAULT_SOURCE -D + #default to /usr/share/man for man page + #note: some systems use /usr/local/share/man, others use /usr/local/man + #packagers should set the variable accordingly +-MANDIR = /usr/share/man/ ++MANDIR = ${PREFIX}/man/ + + #Add the PER_USER_FILES define if the DATADIR is set + ifneq ($(DATADIR),) +@@ -32,17 +32,10 @@ ifneq ($(BUILD_NUMBER),) + DEFS +=-DBUILD_NUMBER="\"$(BUILD_NUMBER)\"" + endif + +-INCS = -I. -I/usr/include -I/usr/include/SDL +-CFLAGS= -Wall -Wextra -Werror -std=c99 +-ifeq ($(DEBUG),) +- CFLAGS += -O3 +-else +- CFLAGS += -g +- DEFS +=-DDEBUG +-endif ++INCS = `sdl-config --cflags` ++CFLAGS+= -Wall -Wextra -std=c99 + +-LDFLAGS=$(CFLAGS) +-LIBS = -lSDL -lSDL_image -lSDL_mixer -lm -lpthread ++LIBS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lm -lpthread + + #Are we compiling with gl? + ifneq ($(WITH_OPENGL),false) +@@ -62,9 +55,6 @@ all: $(TARGET) + + $(TARGET): $(OBJS) + $(LD) $(LDFLAGS) $(OBJS) -o $@ $(LIBS) +-ifeq ($(DEBUG),) +- $(STRIP) $@ +-endif + + tools: mkbundle + Added: head/games/wizznic/files/patch-src_bundle.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/wizznic/files/patch-src_bundle.c Thu Dec 12 14:44:17 2019 (r519929) @@ -0,0 +1,20 @@ +--- src/bundle.c.orig 2016-02-16 19:47:58 UTC ++++ src/bundle.c +@@ -104,7 +104,7 @@ int dirScan( const char* dir,int type, list_t* list ) + sprintf(buf, "%s/%s",dir,pent->d_name); + if(stat(buf, &st)==0) + { +- if( (st.st_mode&S_IFDIR)==S_IFDIR ) ++ if( (st.st_mode&S_IFMT)==S_IFDIR ) + { + if( type==TYPE_DIR) + { +@@ -120,7 +120,7 @@ int dirScan( const char* dir,int type, list_t* list ) + { + return(0); + } +- } else if( (st.st_mode&&S_IFREG)) ++ } else if( (st.st_mode&S_IFMT)==S_IFREG) + { + if( type== TYPE_FILE ) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912121444.xBCEiHDM033228>