diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2006-04-25 15:34:30 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2006-04-25 15:34:30 +0000 |
| commit | 67c7391607044742d450c745939bb74964eddeaf (patch) | |
| tree | fdea9ea61184e62b3ee31fe35dd5a95ad7cebb34 /graphics/cenon | |
| parent | 6740060dcf1b94a92aca59563d211bb3a8ac524b (diff) | |
| download | ports-67c7391607044742d450c745939bb74964eddeaf.tar.gz ports-67c7391607044742d450c745939bb74964eddeaf.zip | |
- unbreak gcc4.x.x
- cleanup gnustep options
Notes
Notes:
svn path=/head/; revision=160441
Diffstat (limited to 'graphics/cenon')
| -rw-r--r-- | graphics/cenon/Makefile | 9 | ||||
| -rw-r--r-- | graphics/cenon/files/patch-functions.h | 11 | ||||
| -rw-r--r-- | graphics/cenon/files/patch-vhfCommonFunctions.h | 20 |
3 files changed, 32 insertions, 8 deletions
diff --git a/graphics/cenon/Makefile b/graphics/cenon/Makefile index 163bc4ea03db..8b95cced8050 100644 --- a/graphics/cenon/Makefile +++ b/graphics/cenon/Makefile @@ -17,16 +17,13 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= danfe@FreeBSD.org COMMENT= A vector graphics tool for GNUstep -GNUSTEP_PREFIX?= ${LOCALBASE}/GNUstep -PREFIX= ${GNUSTEP_PREFIX} -NO_MTREE= yes USE_BZIP2= yes USE_GMAKE= yes USE_GNUSTEP= yes +USE_GNUSTEP_PREFIX= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_BUILD= yes USE_GNUSTEP_INSTALL= yes -USE_REINPLACE= yes WRKSRC= ${WRKDIR}/Cenon MAKEFILE= GNUmakefile @@ -35,10 +32,6 @@ OPTIONS= FULL_LIBRARY "Install complete Cenon Library" off .include <bsd.port.pre.mk> -.if ${CC} == "gcc40" || ${CC} == "gcc41" || ${CC} == "gcc42" -BROKEN= Does not compile -.endif - .if defined(WITH_FULL_LIBRARY) DISTFILES+= CenonLibrary-${PORTVERSION}-1${EXTRACT_SUFX} PLIST_SUB+= FULL="" diff --git a/graphics/cenon/files/patch-functions.h b/graphics/cenon/files/patch-functions.h new file mode 100644 index 000000000000..caeae5b2f704 --- /dev/null +++ b/graphics/cenon/files/patch-functions.h @@ -0,0 +1,11 @@ +--- functions.h.orig Tue Jan 11 18:56:41 2005 ++++ functions.h Tue Apr 25 17:25:29 2006 +@@ -41,7 +41,7 @@ + NSString *systemBundlePath(void); + NSString *userBundlePath(void); + +-void fillPopup(id popupButton, NSString *folder, NSString *ext, int removeIx ); ++void fillPopup(NSPopUpButton *popupButton, NSString *folder, NSString *ext, int removeIx ); + NSDictionary *dictionaryFromFolder(NSString *folder, NSString *name); + + float convertToUnit(float value); diff --git a/graphics/cenon/files/patch-vhfCommonFunctions.h b/graphics/cenon/files/patch-vhfCommonFunctions.h new file mode 100644 index 000000000000..5ff667d95614 --- /dev/null +++ b/graphics/cenon/files/patch-vhfCommonFunctions.h @@ -0,0 +1,20 @@ +--- VHFShared/vhfCommonFunctions.h.orig Sun Dec 12 16:25:57 2004 ++++ VHFShared/vhfCommonFunctions.h Tue Apr 25 17:18:43 2006 +@@ -36,6 +36,8 @@ + #ifndef VHF_H_COMMONFUNCTIONS + #define VHF_H_COMMONFUNCTIONS + ++#include <AppKit/AppKit.h> ++ + #include "types.h" + + /* Timers used to automatically scroll when the mouse is +@@ -44,7 +46,7 @@ + #define StartTimer(inTimerLoop) if (!inTimerLoop) { [NSEvent startPeriodicEventsAfterDelay:0.1 withPeriod:0.01]; inTimerLoop=YES; } + #define StopTimer(inTimerLoop) if (inTimerLoop) { [NSEvent stopPeriodicEvents]; inTimerLoop=NO; } + +-void sortPopup(id popupButton, int startIx); ++void sortPopup(NSPopUpButton *popupButton, int startIx); + + NSString *stringWithConvertedChars(NSString *string, NSDictionary *conversionDict); + |