diff options
| -rw-r--r-- | graphics/cimg/Makefile | 5 | ||||
| -rw-r--r-- | graphics/cimg/distinfo | 6 | ||||
| -rw-r--r-- | graphics/cimg/files/patch-examples::Makefile | 31 | ||||
| -rw-r--r-- | graphics/cimg/pkg-plist | 54 |
4 files changed, 50 insertions, 46 deletions
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 6a91165014a1..b9a11b9786a4 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -6,8 +6,7 @@ # PORTNAME= cimg -DISTVERSION= 1-13 -PORTREVISION= 1 +DISTVERSION= 1-14 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -61,7 +60,7 @@ post-build: do-install: ${INSTALL_DATA} ${WRKSRC}/CImg.h ${PREFIX}/include .if !defined(NOPORTDOCS) - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/CImg_test ${PREFIX}/bin + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/CImg_demo ${PREFIX}/bin ${MKDIR} ${DOCSDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${DOCSDIR} . for doc in ${DOCREFS} diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo index 710118bdc30e..cdd4bdc5be76 100644 --- a/graphics/cimg/distinfo +++ b/graphics/cimg/distinfo @@ -1,3 +1,3 @@ -MD5 (CImg-1-13.zip) = fc18a569c7471b80274d4b6b1e7fcefd -SHA256 (CImg-1-13.zip) = 872f0172c4c2b8ce0c3a092f8f7d655ab026091042fd990320d82789747c2db9 -SIZE (CImg-1-13.zip) = 3101397 +MD5 (CImg-1-14.zip) = 70d01cb7b2e770c989af3f88b369d9ce +SHA256 (CImg-1-14.zip) = c0741292b489608356611944acf3295f9870f34f72dce05042d969d20bbd31a3 +SIZE (CImg-1-14.zip) = 3352035 diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile index 244859fd6375..61d8a3bdfb62 100644 --- a/graphics/cimg/files/patch-examples::Makefile +++ b/graphics/cimg/files/patch-examples::Makefile @@ -1,5 +1,5 @@ ---- examples/Makefile.orig Fri Mar 31 18:11:20 2006 -+++ examples/Makefile Fri Mar 31 19:45:50 2006 +--- examples/Makefile.orig Thu May 18 15:11:56 2006 ++++ examples/Makefile Thu May 18 21:04:55 2006 @@ -7,10 +7,10 @@ # ----------------------------------------------------------------------------------- @@ -7,28 +7,29 @@ -CC = g++ -X11PATH = /usr/X11R6 -CFLAGS = -Wall -ansi -pedantic -ffast-math -I$(X11PATH)/include --LDFLAGS = -lm -lpthread -lX11 -L$(X11PATH)/lib +-LDFLAGS = -lm +CC = $(CXX) +#X11PATH = /usr/X11R6 +#CFLAGS = -Wall -ansi -pedantic -ffast-math -I$(X11PATH)/include -+#LDFLAGS = -lm -lpthread -lX11 -L$(X11PATH)/lib - CIMGVER = 1.13 ++#LDFLAGS = -lm + CIMGVER = 1.14 - # Compilation rules -@@ -18,7 +18,7 @@ + CIMGFILES = CImg_demo \ +@@ -38,7 +38,7 @@ @echo @echo "** Compiling '$* ($(CIMGVER))' with '`$(CC) -v 2>&1 | grep version`'" @echo - $(CC) -o $* $< $(CFLAGS) $(LDFLAGS) $(ARCHFLAGS) + $(CC) -o $* $< $(CPPFLAGS) -Wall -ansi -pedantic -ffast-math -I$(X11PATH)/include -lX11 -L$(X11PATH)/lib $(LDFLAGS) - - first: + menu: @echo -@@ -72,6 +72,7 @@ + @echo "CImg Library $(CIMGVER) : Examples" +@@ -63,7 +63,7 @@ + all: $(CIMGFILES) clean: - rm -f *.exe *~ \ -+ Makefile.orig \ - CImg_test \ - fade_images \ - greycstoration \ +- rm -f *.exe *~ $(CIMGFILES) ++ rm -f *.exe *~ $(CIMGFILES) Makefile.orig + + # Linux/Mac OSX targets + linux: diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist index 669783e13d08..925c82cc599c 100644 --- a/graphics/cimg/pkg-plist +++ b/graphics/cimg/pkg-plist @@ -1,4 +1,4 @@ -%%PORTDOCS%%bin/CImg_test +%%PORTDOCS%%bin/CImg_demo include/CImg.h %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt %%PORTDOCS%%%%DOCSDIR%%/README.txt @@ -156,36 +156,39 @@ include/CImg.h %%PORTDOCS%%%%DOCSDIR%%/reference/tab_r.gif %%PORTDOCS%%%%DOCSDIR%%/reference/tabs.css %%PORTDOCS%%%%DOCSDIR%%/screenshots.shtml -%%PORTDOCS%%%%EXAMPLESDIR%%/CImg_test.cpp +%%PORTDOCS%%%%EXAMPLESDIR%%/CImg_demo.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile +%%PORTDOCS%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.cpp +%%PORTDOCS%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.m %%PORTDOCS%%%%EXAMPLESDIR%%/fade_images.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/greycstoration.cpp +%%PORTDOCS%%%%EXAMPLESDIR%%/greycstoration4integration.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/hough_transform.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/image2ascii.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/image_registration.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/image_surface.cpp -%%PORTDOCS%%%%EXAMPLESDIR%%/img/brain.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/cdrom.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/choose.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/dynamite.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy10.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy11.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy12.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy13.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy14.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy15.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy16.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy2.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy3.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy4.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy5.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy6.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy7.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy8.png -%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy9.png +%%PORTDOCS%%%%EXAMPLESDIR%%/img/brain.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/cdrom.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/choose.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/dynamite.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy10.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy11.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy12.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy13.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy14.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy15.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy16.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy2.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy3.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy4.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy5.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy6.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy7.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy8.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/enemy9.bmp %%PORTDOCS%%%%EXAMPLESDIR%%/img/foot.ppm -%%PORTDOCS%%%%EXAMPLESDIR%%/img/heart.png +%%PORTDOCS%%%%EXAMPLESDIR%%/img/heart.bmp %%PORTDOCS%%%%EXAMPLESDIR%%/img/lena.pgm %%PORTDOCS%%%%EXAMPLESDIR%%/img/light3d.ppm %%PORTDOCS%%%%EXAMPLESDIR%%/img/logo.ppm @@ -194,11 +197,12 @@ include/CImg.h %%PORTDOCS%%%%EXAMPLESDIR%%/img/parrot_original.ppm %%PORTDOCS%%%%EXAMPLESDIR%%/img/sh0r.pgm %%PORTDOCS%%%%EXAMPLESDIR%%/img/sh1r.pgm -%%PORTDOCS%%%%EXAMPLESDIR%%/img/title.jpg -%%PORTDOCS%%%%EXAMPLESDIR%%/img/tomato.png +%%PORTDOCS%%%%EXAMPLESDIR%%/img/title.bmp +%%PORTDOCS%%%%EXAMPLESDIR%%/img/tomato.bmp %%PORTDOCS%%%%EXAMPLESDIR%%/inrcast.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/mcf_levelsets.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/mcf_levelsets3D.cpp +%%PORTDOCS%%%%EXAMPLESDIR%%/nlmeans.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/odykill.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/pde_TschumperleDeriche2D.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/pde_heatflow2D.cpp |