diff options
Diffstat (limited to 'comms/gnokii')
| -rw-r--r-- | comms/gnokii/Makefile | 11 | ||||
| -rw-r--r-- | comms/gnokii/files/patch-common-Makefile.in | 12 | ||||
| -rw-r--r-- | comms/gnokii/files/patch-xgnokii-Makefile.in | 10 |
3 files changed, 3 insertions, 30 deletions
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile index 1c77a47e0b1c..77a7dd2b89d1 100644 --- a/comms/gnokii/Makefile +++ b/comms/gnokii/Makefile @@ -19,19 +19,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser GROUPS= ${PORTNAME} -USES= gettext gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_CSTD= gnu89 -WANT_GNOME= yes USE_GNOME= intltool GNU_CONFIGURE= yes -CPPFLAGS+= ${CFLAGS} -I${LOCALBASE}/include -fPIC CONFIGURE_ARGS+= --enable-security -CONFIGURE_ENV+= MSGFMT="${LOCALBASE}/bin/msgfmt" \ - XGETTEXT="${LOCALBASE}/bin/xgettext" \ - LIBS="-L${WRKSRC}/common -L${LOCALBASE}/lib" \ - PKG_CONFIG="${LOCALBASE}/bin/pkg-config" -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib SUB_FILES+= pkg-message PORTDOCS= * diff --git a/comms/gnokii/files/patch-common-Makefile.in b/comms/gnokii/files/patch-common-Makefile.in deleted file mode 100644 index 31358b6e36d4..000000000000 --- a/comms/gnokii/files/patch-common-Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- common/Makefile.in.orig 2008-02-23 17:18:24.000000000 +0100 -+++ common/Makefile.in 2008-02-23 17:18:53.000000000 +0100 -@@ -318,7 +318,8 @@ - $(DATA_DIR) - - pkgconfig_DATA = gnokii.pc --pkgconfigdir = $(libdir)/pkgconfig -+libdatadir = $(libdir)data -+pkgconfigdir = $(libdatadir)/pkgconfig - libgnokii_la_CPPFLAGS = -DLIBDIR="\"$(libdir)\"" - libgnokii_la_CFLAGS = -I$(top_srcdir)/include - libgnokii_la_SOURCES = \ diff --git a/comms/gnokii/files/patch-xgnokii-Makefile.in b/comms/gnokii/files/patch-xgnokii-Makefile.in index 75dd784cc69c..1a8f09465c06 100644 --- a/comms/gnokii/files/patch-xgnokii-Makefile.in +++ b/comms/gnokii/files/patch-xgnokii-Makefile.in @@ -9,13 +9,3 @@ am__DEPENDENCIES_1 = xgnokii_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(top_builddir)/common/libgnokii.la \ -@@ -360,7 +360,8 @@ - #FIXME install help - HELP_DIR = docs/help - pkgconfig_DATA = xgnokii.pc --pkgconfigdir = $(libdir)/pkgconfig -+libdatadir = $(libdir)data -+pkgconfigdir = $(libdatadir)/pkgconfig - desktop_in_files = xgnokii.desktop.in - desktopdir = $(datadir)/applications - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) |