Attachment 138782 Details for Bug 184864 – file.diff

[patch] file.diff

file.diff (text/plain), 3.86 KB, created by tkato432 on 2013-12-16 18:10:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-12-16 18:10:17 UTC

Size: 3.86 KB

patch

obsolete

>diff -urN /usr/ports/graphics/apngasm/Makefile graphics/apngasm/Makefile
>--- /usr/ports/graphics/apngasm/Makefile	2013-12-11 05:39:55.000000000 +0900
>+++ graphics/apngasm/Makefile	2013-12-17 00:00:00.000000000 +0900
>@@ -2,50 +2,40 @@
> # $FreeBSD: head/graphics/apngasm/Makefile 336096 2013-12-10 19:39:46Z nemysis $
> 
> PORTNAME=	apngasm
>-PORTVERSION=	2.7
>+PORTVERSION=	2.8
> DISTVERSIONSUFFIX=-src
> CATEGORIES=	graphics
> MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
>+EXTRACT_SUFX=	.zip
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Creates an APNG animation from a PNG/TGA image sequence
>+COMMENT=	Create Animated PNG from a sequence of files
> 
> LICENSE=	ZLIB
> 
>-NO_WRKSUBDIR=	yes
>-
>-USE_DOS2UNIX=	yes
>-USE_ZIP=	yes
>+OPTIONS_DEFINE=	DOCS STATIC
> 
>-CPPFLAGS+=	`libpng-config --I_opts`
>-LDFLAGS+=	`libpng-config --ldflags` -lm -lz
>+NO_WRKSUBDIR=	yes
> 
>-PLIST_FILES=	bin/${PORTNAME}
>+USES=		dos2unix gmake
> 
> PORTDOCS=	readme.txt
>+PLIST_FILES=	bin/${PORTNAME}
> 
>-OPTIONS_DEFINE=	DOCS STATIC
>-
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MSTATIC}
> BUILD_DEPENDS+=	${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png
>-LDFLAGS+=	-static
>+MAKE_ENV+=	STATIC=1
> .else
>-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
>+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
> .endif
> 
>-do-build:
>-	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} ${PORTNAME}.c \
>-		-o ${PORTNAME} ${LDFLAGS}
>-
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
>-
>-.if ${PORT_OPTIONS:MDOCS}
>-	${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
>-.endif
>+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
>+		${STAGEDIR}${PREFIX}/bin)
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
>+		${STAGEDIR}${DOCSDIR})
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/graphics/apngasm/distinfo graphics/apngasm/distinfo
>--- /usr/ports/graphics/apngasm/distinfo	2013-11-06 22:01:58.000000000 +0900
>+++ graphics/apngasm/distinfo	2013-12-17 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (apngasm-2.7-src.zip) = af42569666cab268a20a0754191396c9d48f4e01d6e8f93c3ae1164c3c821cc3
>-SIZE (apngasm-2.7-src.zip) = 11448
>+SHA256 (apngasm-2.8-src.zip) = 47bee31bc149efc5932a87819cc0daea668cf7322eeaed9378c43edbdc9803bc
>+SIZE (apngasm-2.8-src.zip) = 568753
>diff -urN /usr/ports/graphics/apngasm/files/patch-Makefile graphics/apngasm/files/patch-Makefile
>--- /usr/ports/graphics/apngasm/files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/apngasm/files/patch-Makefile	2013-12-17 00:00:00.000000000 +0900
>@@ -0,0 +1,48 @@
>+--- Makefile.orig
>++++ Makefile
>+@@ -1,10 +1,17 @@
>+ PACKAGE    = apngasm
>+-CC         = gcc
>++CC        ?= cc
>++CXX       ?= c++
>+ SRC_DIRS   = . 7z zopfli
>+-CFLAGS     = -Wall -pedantic
>+-CFLAGS_OPT = -O2
>++CFLAGS    += -Wall -pedantic
>++CXXFLAGS  += -Wall -pedantic
>++CPPFLAGS  += $(shell libpng-config --cflags)
>+ CFLAGS_7Z  = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
>+-LIBS       = -lstdc++ -lm -lpng -lz
>++ifeq ($(strip $(STATIC)),)
>++LIBS       = $(shell libpng-config --ldflags)
>++else
>++LIBS       = $(shell libpng-config --static --ldflags)
>++LDFLAGS   += -static
>++endif
>+ 
>+ INCUDE_DIRS := $(addprefix -I./, $(SRC_DIRS))
>+ OBJ_DIRS := $(addprefix obj/, $(SRC_DIRS))
>+@@ -16,19 +23,19 @@
>+ all : $(PACKAGE)
>+ 
>+ $(PACKAGE) : objdirs $(OBJECTS)
>+-	$(CC) -o $@ $(OBJECTS) -s $(LIBS)
>++	$(CXX) -o $@ $(OBJECTS) $(LIBS) $(LDFLAGS)
>+ 
>+ objdirs :
>+ 	mkdir -p $(OBJ_DIRS)
>+ 
>+ obj/%.o : %.cpp
>+-	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT)
>++	$(CXX) -o $@ -c $< $(INCUDE_DIRS) $(CXXFLAGS) $(CPPFLAGS)
>+ 
>+ obj/%.o : %.c
>+-	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT)
>++	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CPPFLAGS)
>+ 
>+ obj/%.o : %.cc
>+-	$(CC) -o $@ -c $< $(INCUDE_DIRS) $(CFLAGS) $(CFLAGS_OPT) $(CFLAGS_7Z)
>++	$(CXX) -o $@ -c $< $(INCUDE_DIRS) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS_7Z)
>+ 
>+ .PHONY : clean
>+

Actions: View | Diff

Attachments on bug 184864: 138782