Attachment #25207 for bug #42969

View | Details | Raw Unified | Return to bug 42969
Collapse All | Expand All

Lines 7-12 Link Here

(-)graphics/imlib2/Makefile (+1 lines)
7		7
8	PORTNAME= imlib2	8	PORTNAME= imlib2
9	PORTVERSION= 1.0.6	9	PORTVERSION= 1.0.6
		10	PORTREVISION= 1
10	CATEGORIES= graphics	11	CATEGORIES= graphics
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= enlightenment	13	MASTER_SITE_SUBDIR= enlightenment




--- loaders/Makefile.in.orig	Fri Apr 26 08:45:29 2002
+++ loaders/Makefile.in	Fri Sep 20 04:20:42 2002
@@ -108,39 +108,39 @@
 
 jpeg_la_SOURCES = loader_jpeg.c
 jpeg_la_LDFLAGS = -no-undefined -module -avoid-version
-jpeg_la_LIBADD = @JPEGLIBS@ -L$(top_builddir)/src -lImlib2
+jpeg_la_LIBADD = @JPEGLIBS@ $(top_builddir)/src/libImlib2.la
 
 png_la_SOURCES = loader_png.c
 png_la_LDFLAGS = -no-undefined -module -avoid-version
-png_la_LIBADD = @PNGLIBS@ -L$(top_builddir)/src -lImlib2
+png_la_LIBADD = @PNGLIBS@ $(top_builddir)/src/libImlib2.la
 
 tiff_la_SOURCES = loader_tiff.c
 tiff_la_LDFLAGS = -no-undefined -module -avoid-version
-tiff_la_LIBADD = @TIFFLIBS@ -L$(top_builddir)/src -lImlib2
+tiff_la_LIBADD = @TIFFLIBS@ $(top_builddir)/src/libImlib2.la
 
 gif_la_SOURCES = loader_gif.c
 gif_la_LDFLAGS = -no-undefined -module -avoid-version
-gif_la_LIBADD = @GIFLIBS@ -L$(top_builddir)/src -lImlib2
+gif_la_LIBADD = @GIFLIBS@ $(top_builddir)/src/libImlib2.la
 
 pnm_la_SOURCES = loader_pnm.c
 pnm_la_LDFLAGS = -no-undefined -module -avoid-version
-pnm_la_LIBADD = -L$(top_builddir)/src -lImlib2
+pnm_la_LIBADD = $(top_builddir)/src/libImlib2.la
 
 argb_la_SOURCES = loader_argb.c
 argb_la_LDFLAGS = -no-undefined -module -avoid-version
-argb_la_LIBADD = -L$(top_builddir)/src -lImlib2
+argb_la_LIBADD = $(top_builddir)/src/libImlib2.la
 
 bmp_la_SOURCES = loader_bmp.c
 bmp_la_LDFLAGS = -no-undefined -module -avoid-version
-bmp_la_LIBADD = -L$(top_builddir)/src -lImlib2
+bmp_la_LIBADD = $(top_builddir)/src/libImlib2.la
 
 xpm_la_SOURCES = loader_xpm.c
 xpm_la_LDFLAGS = -no-undefined -module -avoid-version
-xpm_la_LIBADD = -L$(top_builddir)/src -lImlib2
+xpm_la_LIBADD = $(top_builddir)/src/libImlib2.la
 
 tga_la_SOURCES = loader_tga.c
 tga_la_LDFLAGS = -no-undefined -module -avoid-version
-tga_la_LIBADD = -L$(top_builddir)/src -lImlib2
+tga_la_LIBADD = $(top_builddir)/src/libImlib2.la
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 




lib/loaders/filter/bump_map.so
lib/loaders/filter/colormod.so
lib/loaders/filter/testfilter.so
lib/loaders/image/argb.so
lib/loaders/image/bmp.so
lib/loaders/image/gif.so
lib/loaders/image/jpeg.so
lib/loaders/image/png.so
lib/loaders/image/pnm.so
lib/loaders/image/tga.so
lib/loaders/image/tiff.so
lib/loaders/image/xpm.so
@dirrm lib/loaders/filter
@dirrm lib/loaders/image
@dirrm lib/loaders/filter
@dirrm lib/loaders

Return to bug 42969

Line 0 Link Here

(-)graphics/imlib2/files/patch-loaders::Makefile.in (+51 lines)
	1	--- loaders/Makefile.in.orig Fri Apr 26 08:45:29 2002
	2	+++ loaders/Makefile.in Fri Sep 20 04:20:42 2002
	3	@@ -108,39 +108,39 @@
	4
	5	jpeg_la_SOURCES = loader_jpeg.c
	6	jpeg_la_LDFLAGS = -no-undefined -module -avoid-version
	7	-jpeg_la_LIBADD = @JPEGLIBS@ -L$(top_builddir)/src -lImlib2
	8	+jpeg_la_LIBADD = @JPEGLIBS@ $(top_builddir)/src/libImlib2.la
	9
	10	png_la_SOURCES = loader_png.c
	11	png_la_LDFLAGS = -no-undefined -module -avoid-version
	12	-png_la_LIBADD = @PNGLIBS@ -L$(top_builddir)/src -lImlib2
	13	+png_la_LIBADD = @PNGLIBS@ $(top_builddir)/src/libImlib2.la
	14
	15	tiff_la_SOURCES = loader_tiff.c
	16	tiff_la_LDFLAGS = -no-undefined -module -avoid-version
	17	-tiff_la_LIBADD = @TIFFLIBS@ -L$(top_builddir)/src -lImlib2
	18	+tiff_la_LIBADD = @TIFFLIBS@ $(top_builddir)/src/libImlib2.la
	19
	20	gif_la_SOURCES = loader_gif.c
	21	gif_la_LDFLAGS = -no-undefined -module -avoid-version
	22	-gif_la_LIBADD = @GIFLIBS@ -L$(top_builddir)/src -lImlib2
	23	+gif_la_LIBADD = @GIFLIBS@ $(top_builddir)/src/libImlib2.la
	24
	25	pnm_la_SOURCES = loader_pnm.c
	26	pnm_la_LDFLAGS = -no-undefined -module -avoid-version
	27	-pnm_la_LIBADD = -L$(top_builddir)/src -lImlib2
	28	+pnm_la_LIBADD = $(top_builddir)/src/libImlib2.la
	29
	30	argb_la_SOURCES = loader_argb.c
	31	argb_la_LDFLAGS = -no-undefined -module -avoid-version
	32	-argb_la_LIBADD = -L$(top_builddir)/src -lImlib2
	33	+argb_la_LIBADD = $(top_builddir)/src/libImlib2.la
	34
	35	bmp_la_SOURCES = loader_bmp.c
	36	bmp_la_LDFLAGS = -no-undefined -module -avoid-version
	37	-bmp_la_LIBADD = -L$(top_builddir)/src -lImlib2
	38	+bmp_la_LIBADD = $(top_builddir)/src/libImlib2.la
	39
	40	xpm_la_SOURCES = loader_xpm.c
	41	xpm_la_LDFLAGS = -no-undefined -module -avoid-version
	42	-xpm_la_LIBADD = -L$(top_builddir)/src -lImlib2
	43	+xpm_la_LIBADD = $(top_builddir)/src/libImlib2.la
	44
	45	tga_la_SOURCES = loader_tga.c
	46	tga_la_LDFLAGS = -no-undefined -module -avoid-version
	47	-tga_la_LIBADD = -L$(top_builddir)/src -lImlib2
	48	+tga_la_LIBADD = $(top_builddir)/src/libImlib2.la
	49	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
	50	CONFIG_HEADER = ../config.h
	51	CONFIG_CLEAN_FILES =

Lines 6-20 Link Here

(-)graphics/imlib2/pkg-plist (-10 / +10 lines)
6	lib/loaders/filter/bump_map.so	6	lib/loaders/filter/bump_map.so
7	lib/loaders/filter/colormod.so	7	lib/loaders/filter/colormod.so
8	lib/loaders/filter/testfilter.so	8	lib/loaders/filter/testfilter.so
9	lib/loaders/image/argb.a	9	lib/loaders/image/argb.so
10	lib/loaders/image/bmp.a	10	lib/loaders/image/bmp.so
11	lib/loaders/image/gif.a	11	lib/loaders/image/gif.so
12	lib/loaders/image/jpeg.a	12	lib/loaders/image/jpeg.so
13	lib/loaders/image/png.a	13	lib/loaders/image/png.so
14	lib/loaders/image/pnm.a	14	lib/loaders/image/pnm.so
15	lib/loaders/image/tga.a	15	lib/loaders/image/tga.so
16	lib/loaders/image/tiff.a	16	lib/loaders/image/tiff.so
17	lib/loaders/image/xpm.a	17	lib/loaders/image/xpm.so
18	@dirrm lib/loaders/filter
19	@dirrm lib/loaders/image	18	@dirrm lib/loaders/image
		19	@dirrm lib/loaders/filter
20	@dirrm lib/loaders	20	@dirrm lib/loaders