diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-03-20 20:07:56 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-03-20 20:07:56 +0000 |
| commit | 1ad28840ec0bf6a2433de11620ec41c2e0e95613 (patch) | |
| tree | 356d7ca7c1a20955a66f681b74f9a29d762869f3 /media-sound/mup/files | |
| parent | x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly (diff) | |
| download | gentoo-2-1ad28840ec0bf6a2433de11620ec41c2e0e95613.tar.gz gentoo-2-1ad28840ec0bf6a2433de11620ec41c2e0e95613.tar.bz2 gentoo-2-1ad28840ec0bf6a2433de11620ec41c2e0e95613.zip | |
x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/mup/files')
| -rw-r--r-- | media-sound/mup/files/mup-5.4-Makefile.patch | 4 | ||||
| -rw-r--r-- | media-sound/mup/files/mup-5.6-Makefile.patch | 4 | ||||
| -rw-r--r-- | media-sound/mup/files/mup-5.7-Makefile.patch | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/media-sound/mup/files/mup-5.4-Makefile.patch b/media-sound/mup/files/mup-5.4-Makefile.patch index 99dc34f6ee61..3aff321d0719 100644 --- a/media-sound/mup/files/mup-5.4-Makefile.patch +++ b/media-sound/mup/files/mup-5.4-Makefile.patch @@ -360,8 +360,8 @@ diff -urN mup-5.4.orig/Makefile mup-5.4/Makefile + +mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \ -+ -I/usr/include/fltk-1.1 -Imup -L$(X_LOCATION)/lib \ -+ -L/usr/lib/fltk-1.1 -lfltk -lfltk_images -lXext -lX11 -lXpm \ ++ -I/usr/include/fltk-1 -Imup -L$(X_LOCATION)/lib \ ++ -L/usr/lib/fltk-1 -lfltk -lfltk_images -lXext -lX11 -lXpm \ + -l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm + +install: all diff --git a/media-sound/mup/files/mup-5.6-Makefile.patch b/media-sound/mup/files/mup-5.6-Makefile.patch index 36aed70d83fb..e44ffa215efd 100644 --- a/media-sound/mup/files/mup-5.6-Makefile.patch +++ b/media-sound/mup/files/mup-5.6-Makefile.patch @@ -10,9 +10,9 @@ diff -urN mup-5.6.orig/Makefile mup-5.6/Makefile +CFLAGS = -O2 -pipe +CXXFLAGS = -O2 -pipe +X_LOCATION = /usr -+FLTK_LIB_LOCATION = -L/usr/lib/fltk-1.1 ++FLTK_LIB_LOCATION = -L/usr/lib/fltk-1 +X_LIBS = -lXext -lX11 -lXpm -+FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1.1 ++FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1 +JPEGLIB = jpeg +PNGLIB = png +ZLIB = z diff --git a/media-sound/mup/files/mup-5.7-Makefile.patch b/media-sound/mup/files/mup-5.7-Makefile.patch index 402e2f34de95..a36a0042ca24 100644 --- a/media-sound/mup/files/mup-5.7-Makefile.patch +++ b/media-sound/mup/files/mup-5.7-Makefile.patch @@ -264,9 +264,9 @@ +CFLAGS = -O2 -pipe +CXXFLAGS = -O2 -pipe +X_LOCATION = /usr -+FLTK_LIB_LOCATION = -L/usr/lib/fltk-1.1 ++FLTK_LIB_LOCATION = -L/usr/lib/fltk-1 +X_LIBS = -lXext -lX11 -lXpm -+FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1.1 ++FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1 +JPEGLIB = jpeg +PNGLIB = png +ZLIB = z |