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

(-)gnokii/Makefile (-27 / +20 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	gnokii
8
PORTNAME=	gnokii
9
PORTVERSION=	0.6.22
9
PORTVERSION=	0.6.26
10
PORTEPOCH=	1
10
PORTEPOCH=	1
11
CATEGORIES=	comms
11
CATEGORIES=	comms
12
MASTER_SITES=	http://www.gnokii.org/download/gnokii/ \
12
MASTER_SITES=	http://www.gnokii.org/download/gnokii/ \
Lines 28-38 Link Here
28
		LIBS="-L../common -L${LOCALBASE}/lib" \
28
		LIBS="-L../common -L${LOCALBASE}/lib" \
29
		PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
29
		PKG_CONFIG="${LOCALBASE}/bin/pkg-config"
30
30
31
MAN1=		gnokii.1 sendsms.1
32
MAN8=		gnokiid.8 mgnokiidev.8
33
PORTDOCS=	*
34
35
INSTALL_TARGET=	install-binaries install-docs install-includes
36
PKGDEINSTALL=	${PKGINSTALL}
31
PKGDEINSTALL=	${PKGINSTALL}
37
PKGMESSAGE=	${WRKDIR}/pkg-message
32
PKGMESSAGE=	${WRKDIR}/pkg-message
38
33
Lines 43-48 Link Here
43
38
44
.include <bsd.port.pre.mk>
39
.include <bsd.port.pre.mk>
45
40
41
.if !defined(NOPORTDOCS)
42
MAN1=		gnokii.1 sendsms.1
43
MAN8=		gnokiid.8 mgnokiidev.8
44
PORTDOCS=	*
45
.endif
46
46
.if exists(${LOCALBASE}/lib/libical.so)
47
.if exists(${LOCALBASE}/lib/libical.so)
47
WITH_ICAL=	yes
48
WITH_ICAL=	yes
48
.endif
49
.endif
Lines 83-88 Link Here
83
PLIST_SUB+=	SMSD='@comment '
84
PLIST_SUB+=	SMSD='@comment '
84
PLIST_SUB+=	PGM='@comment '
85
PLIST_SUB+=	PGM='@comment '
85
PLIST_SUB+=	MSM='@comment '
86
PLIST_SUB+=	MSM='@comment '
87
CONFIGURE_ARGS+=	--disable-smsd
86
.else
88
.else
87
PLIST_SUB+=	SMSD=''
89
PLIST_SUB+=	SMSD=''
88
MAN8+=		smsd.8
90
MAN8+=		smsd.8
Lines 100-110 Link Here
100
.else
102
.else
101
PLIST_SUB+=	PGM='@comment '
103
PLIST_SUB+=	PGM='@comment '
102
.endif
104
.endif
103
.if defined(SMSD_WITH_GLIB1)
104
USE_GNOME+=	glib12
105
.else
106
USE_GNOME+=	glib20
107
.endif
108
.endif
105
.endif
109
106
110
.if defined(WITHOUT_X11)
107
.if defined(WITHOUT_X11)
Lines 112-120 Link Here
112
PLIST_SUB+=	X11='@comment '
109
PLIST_SUB+=	X11='@comment '
113
.else
110
.else
114
USE_XORG=	xpm
111
USE_XORG=	xpm
115
USE_GNOME+=	gtk20 gnomelibs
112
USE_GNOME+=	gtk20 libgnome
116
PLIST_SUB+=	X11=''
113
PLIST_SUB+=	X11=''
117
MAN1+=	xgnokii.1
114
.if !defined(NOPORTDOCS)
115
MAN1+=		xgnokii.1
116
.endif
118
.endif
117
.endif
119
118
120
.if !defined(WITHOUT_NLS)
119
.if !defined(WITHOUT_NLS)
Lines 136-147 Link Here
136
	@${ECHO} "always compiled in."
135
	@${ECHO} "always compiled in."
137
	@${ECHO}
136
	@${ECHO}
138
.endif
137
.endif
139
.if !defined(SMSD_WITH_GLIB1)
140
	@${ECHO}
141
	@${ECHO} "smsd defaults to using glib2, if you'd rather link with glib1
142
	@${ECHO} "define SMSD_WITH_GLIB1=yes"
143
	@${ECHO}
144
.endif
145
138
146
post-patch:
139
post-patch:
147
.for f in ${FIXPREFIX}
140
.for f in ${FIXPREFIX}
Lines 154-177 Link Here
154
	@${REINPLACE_CMD} -E -e "s:^(#ifdef.*)__OpenBSD__:\1__FreeBSD__:" \
147
	@${REINPLACE_CMD} -E -e "s:^(#ifdef.*)__OpenBSD__:\1__FreeBSD__:" \
155
		${WRKSRC}/${f}
148
		${WRKSRC}/${f}
156
.endfor
149
.endfor
157
	@${REINPLACE_CMD} -e '/pkgconfig/d' ${WRKSRC}/xgnokii/Makefile
158
.if defined(SMSD_WITH_GLIB1)
159
	@cd ${WRKSRC} && ${PATCH} -s <${PATCHDIR}/smsd-Makefile-WITH_GLIB.diff
160
.endif
161
# fix test conditions on configure
150
# fix test conditions on configure
162
	@${REINPLACE_CMD} -E \
151
	@${REINPLACE_CMD} -E \
163
		-e 's|([[:space:]]+test[[:space:]]+.+)==([[:space:]]+"yes")|\1=\2|' \
152
		-e 's|([[:space:]]+test[[:space:]]+.+)==([[:space:]]+"yes")|\1=\2|' \
164
		${WRKSRC}/${CONFIGURE_SCRIPT}
153
		${WRKSRC}/${CONFIGURE_SCRIPT}
154
	@${MV} ${WRKSRC}/Docs/man/xgnokii.1x ${WRKSRC}/Docs/man/xgnokii.1
165
155
166
post-build:
156
post-build:
167
.if defined(WITH_SMSD)
157
.if defined(WITH_SMSD)
168
.if defined(WITH_MYSQL)
158
.if defined(WITH_MYSQL)
169
	@${REINPLACE_CMD} -e 's/^DB_LIBS := libfile.la$$/DB_LIBS = libfile.la libmysql.la/' ${WRKSRC}/smsd/Makefile
159
	@${REINPLACE_CMD} -e 's/^#libsmsd_mysql_la_SOURCES/libsmsd_mysql_la_SOURCES/' ${WRKSRC}/smsd/Makefile.in
160
	@${REINPLACE_CMD} -e 's/^#libsmsd_mysql_la_LDFLAGS/libsmsd_mysql_la_LDFLAGS/' ${WRKSRC}/smsd/Makefile.in
161
	@${REINPLACE_CMD} -e 's/^#libsmsd_mysql_la_LIBADD/libsmsd_mysql_la_LIBADD/' ${WRKSRC}/smsd/Makefile.in
170
.endif
162
.endif
171
.if defined(WITH_PGSQL)
163
.if defined(WITH_PGSQL)
172
	@${REINPLACE_CMD} -e 's/^DB_LIBS := libfile.la$$/DB_LIBS = libfile.la libpq.la/' -e 's/^DB_LIBS = libfile.la libmysql.la$$/DB_LIBS = libfile.la libpq.la libmysql.la/' ${WRKSRC}/smsd/Makefile
164
	@${REINPLACE_CMD} -e 's/^#libsmsd_pq_la_SOURCES/libsmsd_pq_la_SOURCES/' ${WRKSRC}/smsd/Makefile.in
165
	@${REINPLACE_CMD} -e 's/^#libsmsd_pq_la_LDFLAGS/libsmsd_pq_la_LDFLAGS/' ${WRKSRC}/smsd/Makefile.in
166
	@${REINPLACE_CMD} -e 's/^#libsmsd_pq_la_LIBADD/libsmsd_pq_la_LIBADD/' ${WRKSRC}/smsd/Makefile.in
173
.endif
167
.endif
174
	@cd ${WRKSRC}/smsd && ${GMAKE} all
175
.endif
168
.endif
176
	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
169
	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
177
170
Lines 182-188 Link Here
182
	${INSTALL_DATA} ${WRKSRC}/xgnokii/xgnokii.pc ${PREFIX}/libdata/pkgconfig
175
	${INSTALL_DATA} ${WRKSRC}/xgnokii/xgnokii.pc ${PREFIX}/libdata/pkgconfig
183
	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
176
	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
184
.if !defined(NOPORTDOCS)
177
.if !defined(NOPORTDOCS)
185
	@(cd ${WRKSRC} && ${GMAKE} install-docs)
178
	@(cd ${WRKSRC}/Docs && ${GMAKE} install)
186
.endif
179
.endif
187
	${INSTALL_DATA} ${WRKSRC}/Docs/sample/gnokiirc \
180
	${INSTALL_DATA} ${WRKSRC}/Docs/sample/gnokiirc \
188
		${PREFIX}/etc/gnokiirc.sample
181
		${PREFIX}/etc/gnokiirc.sample
(-)gnokii/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (gnokii-0.6.22.tar.bz2) = 15d64a4911735ee30c03a7bfa9b60f05
1
MD5 (gnokii-0.6.26.tar.bz2) = 60f817d8ce748fea0ec9a05b3537e08d
2
SHA256 (gnokii-0.6.22.tar.bz2) = 9c72fdb581bc0a3653962931592439489be7d9306cd71e94b48689545aeb7be0
2
SHA256 (gnokii-0.6.26.tar.bz2) = 35242b5545ced25383ac8c771b602c15b5585063c3637a23c9ef0a31d3e591ea
3
SIZE (gnokii-0.6.22.tar.bz2) = 1808129
3
SIZE (gnokii-0.6.26.tar.bz2) = 1446615
(-)gnokii/files/patch-Docs-Makefile (-23 lines)
Lines 1-23 Link Here
1
--- Docs/Makefile.orig	Tue Jul  8 23:23:28 2003
2
+++ Docs/Makefile	Tue Jul  8 23:24:48 2003
3
@@ -63,6 +63,7 @@
4
 	@echo
5
 
6
 install:
7
+ifndef NOPORTDOCS
8
 	$(INSTALL) -d $(DESTDIR)$(docdir)
9
 	$(INSTALL) -d $(DESTDIR)$(docdir)/sample/logo
10
 	$(INSTALL) -d $(DESTDIR)$(docdir)/sample/ringtone
11
@@ -79,10 +80,10 @@
12
 	$(INSTALL_DATA) $(GNOKII1_MAN) $(DESTDIR)$(man1dir)
13
 	$(INSTALL_DATA) $(GNOKII8_MAN) $(DESTDIR)$(man8dir)
14
 	if [ "x$(HAVE_XGNOKII)" = "xyes" ]; then \
15
-		$(INSTALL) -d $(DESTDIR)$(xmandir); \
16
-		$(INSTALL_DATA) $(XGNOKII_MAN) $(DESTDIR)$(xmandir); \
17
+		$(INSTALL) $(XGNOKII_MAN) $(DESTDIR)/$(xmandir)/xgnokii.1; \
18
 	fi
19
 	@echo "done"
20
+endif
21
 
22
 clean:
23
 	$(RM) *~
(-)gnokii/files/patch-Docs-man-Makefile.in (+11 lines)
Line 0 Link Here
1
--- Docs/man/Makefile.in.orig  2008-02-23 17:36:56.000000000 +0100
2
+++ Docs/man/Makefile.in       2008-02-23 17:52:50.000000000 +0100
3
@@ -252,7 +252,7 @@
4
 target_vendor = @target_vendor@
5
 top_builddir = @top_builddir@
6
 top_srcdir = @top_srcdir@
7
-man_MANS = gnokii.1 sendsms.1 gnokiid.8 mgnokiidev.8 xgnokii.1x
8
+man_MANS = gnokii.1 sendsms.1 gnokiid.8 mgnokiidev.8 xgnokii.1
9
 EXTRA_DIST = $(man_MANS)
10
 all: all-am
11
 
(-)gnokii/files/patch-Makefile.global.in (-20 lines)
Lines 1-20 Link Here
1
--- Makefile.global.in.orig	2007-11-24 12:31:01.000000000 +0100
2
+++ Makefile.global.in	2007-12-06 11:58:02.000000000 +0100
3
@@ -21,14 +21,14 @@
4
 
5
 bindir         = @bindir@
6
 sbindir        = @sbindir@
7
-xbindir        = @XGNOKIIDIR@/bin/
8
+xbindir        = ${prefix}/bin/
9
 libdir         = @libdir@
10
-xgnokii_libdir = @XGNOKIIDIR@/share/@XPACKAGE@
11
+xgnokii_libdir = ${prefix}/share/@XPACKAGE@
12
 includedir     = @includedir@
13
 mandir         = @mandir@
14
 man1dir        = ${mandir}/man1/
15
 man8dir        = ${mandir}/man8/
16
-xmandir        = @XGNOKIIDIR@/man/man1/
17
+xmandir        = ${mandir}/man1/
18
 datarootdir    = @datarootdir@
19
 docdir         = @docdir@
20
 datadir        = @datadir@
(-)gnokii/files/patch-Makefile.in (+14 lines)
Line 0 Link Here
1
--- Makefile.in.orig	2008-06-02 15:48:31.000000000 +0200
2
+++ Makefile.in	2008-06-02 15:48:47.000000000 +0200
3
@@ -279,9 +279,9 @@
4
 target_vendor = @target_vendor@
5
 top_builddir = @top_builddir@
6
 top_srcdir = @top_srcdir@
7
-SUBDIRS = include common gnokii po patches Docs $(am__append_1) \
8
+SUBDIRS = include common gnokii po patches $(am__append_1) \
9
 	$(am__append_2) $(am__append_3)
10
-DIST_SUBDIRS = include Docs common gnokii gnokiid utils xgnokii po smsd win32 testsuite patches getopt
11
+DIST_SUBDIRS = include common gnokii gnokiid utils xgnokii po smsd win32 testsuite patches getopt
12
 EXTRA_DIST = \
13
 		ChangeLog		\
14
 		COPYING			\
(-)gnokii/files/patch-common-Makefile (-13 lines)
Lines 1-13 Link Here
1
--- common/Makefile.orig	2007-11-24 12:31:01.000000000 +0100
2
+++ common/Makefile	2007-12-06 12:02:39.000000000 +0100
3
@@ -107,8 +107,8 @@
4
 	@echo "done"
5
 
6
 install-devel: install
7
-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
8
-	$(INSTALL_DATA) gnokii.pc $(DESTDIR)$(libdir)/pkgconfig
9
+	$(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig
10
+	$(INSTALL_DATA) gnokii.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
11
 	@echo "done"
12
 
13
 depend dep:
(-)gnokii/files/patch-common-Makefile.in (+12 lines)
Line 0 Link Here
1
--- common/Makefile.in.orig    2008-02-23 17:18:24.000000000 +0100
2
+++ common/Makefile.in 2008-02-23 17:18:53.000000000 +0100
3
@@ -318,7 +318,8 @@
4
       $(DATA_DIR)
5
 
6
 pkgconfig_DATA = gnokii.pc
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+libdatadir = $(libdir)data
9
+pkgconfigdir = $(libdatadir)/pkgconfig
10
 libgnokii_la_CPPFLAGS = -DLIBDIR="\"$(libdir)\""
11
 libgnokii_la_CFLAGS = -I$(top_srcdir)/include
12
 libgnokii_la_SOURCES = \
(-)gnokii/files/patch-configure (-9 / +9 lines)
Lines 1-6 Link Here
1
--- configure.orig	2007-11-24 12:31:25.000000000 +0100
1
--- configure.orig     2008-02-15 10:21:49.000000000 +0100
2
+++ configure	2007-12-06 12:08:24.000000000 +0100
2
+++ configure  2008-02-23 11:08:39.000000000 +0100
3
@@ -981,7 +981,7 @@
3
@@ -1050,7 +1050,7 @@
4
 psdir='${docdir}'
4
 psdir='${docdir}'
5
 libdir='${exec_prefix}/lib'
5
 libdir='${exec_prefix}/lib'
6
 localedir='${datarootdir}/locale'
6
 localedir='${datarootdir}/locale'
Lines 9-15 Link Here
9
 
9
 
10
 ac_prev=
10
 ac_prev=
11
 ac_dashdash=
11
 ac_dashdash=
12
@@ -26588,13 +26588,15 @@
12
@@ -22653,13 +22653,15 @@
13
 # First of all, check if the user has set any of the PTHREAD_LIBS,
13
 # First of all, check if the user has set any of the PTHREAD_LIBS,
14
 # etcetera environment variables, and if threads linking works using
14
 # etcetera environment variables, and if threads linking works using
15
 # them:
15
 # them:
Lines 30-36 Link Here
30
         cat >conftest.$ac_ext <<_ACEOF
30
         cat >conftest.$ac_ext <<_ACEOF
31
 /* confdefs.h.  */
31
 /* confdefs.h.  */
32
 _ACEOF
32
 _ACEOF
33
@@ -26958,7 +26960,7 @@
33
@@ -23023,7 +23025,7 @@
34
 echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
34
 echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
35
         flag=no
35
         flag=no
36
         case "${host_cpu}-${host_os}" in
36
         case "${host_cpu}-${host_os}" in
Lines 39-45 Link Here
39
                 *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
39
                 *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
40
         esac
40
         esac
41
         { echo "$as_me:$LINENO: result: ${flag}" >&5
41
         { echo "$as_me:$LINENO: result: ${flag}" >&5
42
@@ -27762,7 +27764,7 @@
42
@@ -23840,7 +23842,7 @@
43
 
43
 
44
 if test "$enable_libical" == "yes"; then
44
 if test "$enable_libical" == "yes"; then
45
 	OLD_CFLAGS="$CFLAGS"
45
 	OLD_CFLAGS="$CFLAGS"
Lines 48-59 Link Here
48
 	CFLAGS="$CFLAGS $ICAL_CFLAGS"
48
 	CFLAGS="$CFLAGS $ICAL_CFLAGS"
49
 	{ echo "$as_me:$LINENO: checking whether libical is installed" >&5
49
 	{ echo "$as_me:$LINENO: checking whether libical is installed" >&5
50
 echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6; }
50
 echo $ECHO_N "checking whether libical is installed... $ECHO_C" >&6; }
51
@@ -29577,7 +29579,7 @@
51
@@ -25684,7 +25686,7 @@
52
 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
52
 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmWriteFileFromXpmImage" >&6; }
53
 if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then
53
 if test $ac_cv_lib_Xpm_XpmWriteFileFromXpmImage = yes; then
54
    XPM_CFLAGS="$XINCL"
54
    XPM_CFLAGS="$XINCL"
55
-                  XPM_LIBS="$XLIBS -lXpm -lX11"
55
-                  XPM_LIBS="$XLIBS -lXpm -lX11"
56
+                  XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"
56
+                  XPM_LIBS="$XLIBS -lXpm -lX11 -lroken -lcrypt"
57
                   cat >>confdefs.h <<\_ACEOF
57
58
 cat >>confdefs.h <<\_ACEOF
58
 #define XPM 1
59
 #define XPM 1
59
 _ACEOF
(-)gnokii/files/patch-gnokiid-Makefile.in (+13 lines)
Line 0 Link Here
1
--- gnokiid/Makefile.in.orig	2008-05-03 21:21:29.000000000 +0200
2
+++ gnokiid/Makefile.in	2008-05-29 22:14:16.000000000 +0200
3
@@ -322,8 +322,8 @@
4
 	     || test -f $$p1 \
5
 	  ; then \
6
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
7
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
8
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
9
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
10
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
11
 	  else :; fi; \
12
 	done
13
 
(-)gnokii/files/patch-smsd-Makefile (-25 lines)
Lines 1-25 Link Here
1
--- smsd/Makefile.orig	Tue Jul 24 22:31:35 2007
2
+++ smsd/Makefile	Wed Jul 25 23:18:11 2007
3
@@ -29,9 +29,9 @@
4
 LDLIBS += $(PTHREAD_LIBS) \
5
 	  $(shell $(GLIBLDLIBS))
6
 
7
-LDLIBS += -rdynamic $(TOPDIR)/common/libgnokii.la -ldl
8
+# LDLIBS += -rdynamic $(TOPDIR)/common/libgnokii.la -ldl
9
 # Some systems, eg. FreeBSD don't have libdl. Use this:
10
-# LDLIBS += -s -rdynamic -L$(TOPDIR)/common -lgnokii -pthread -L../getopt -lgetopt
11
+LDLIBS += -s -rdynamic -L$(TOPDIR)/common -lgnokii -pthread
12
 
13
 OBJS = 	smsd.lo \
14
 	lowlevel.lo
15
@@ -39,8 +39,8 @@
16
 
17
 # A list of database modules to build.
18
 # FIXME: detect which ones to build in configure
19
-DB_LIBS = libfile.la libpq.la libmysql.la
20
-#DB_LIBS := libfile.la
21
+#DB_LIBS = libfile.la libpq.la libmysql.la
22
+DB_LIBS := libfile.la
23
 
24
 all: smsd
25
 
(-)gnokii/files/patch-smsd-Makefile.in (+13 lines)
Line 0 Link Here
1
--- smsd/Makefile.in.orig	2008-05-03 21:21:32.000000000 +0200
2
+++ smsd/Makefile.in	2008-05-29 22:16:37.000000000 +0200
3
@@ -416,8 +416,8 @@
4
 	     || test -f $$p1 \
5
 	  ; then \
6
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
7
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
8
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
9
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
10
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
11
 	  else :; fi; \
12
 	done
13
 
(-)gnokii/files/patch-xgnokii-Makefile.in (+12 lines)
Line 0 Link Here
1
--- xgnokii/Makefile.in.orig   2008-02-23 17:19:30.000000000 +0100
2
+++ xgnokii/Makefile.in        2008-02-23 17:19:58.000000000 +0100
3
@@ -351,7 +351,8 @@
4
 #FIXME install help
5
 HELP_DIR = docs/help
6
 pkgconfig_DATA = xgnokii.pc
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+libdatadir = $(libdir)data
9
+pkgconfigdir = $(libdatadir)/pkgconfig
10
 desktop_in_files = xgnokii.desktop.in
11
 desktopdir = $(datadir)/applications
12
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
(-)gnokii/pkg-plist (-55 / +10 lines)
Lines 20-26 Link Here
20
lib/libgnokii.a
20
lib/libgnokii.a
21
lib/libgnokii.la
21
lib/libgnokii.la
22
lib/libgnokii.so
22
lib/libgnokii.so
23
lib/libgnokii.so.9
23
lib/libgnokii.so.12
24
libdata/pkgconfig/gnokii.pc
24
libdata/pkgconfig/gnokii.pc
25
libdata/pkgconfig/xgnokii.pc
25
libdata/pkgconfig/xgnokii.pc
26
sbin/gnokiid
26
sbin/gnokiid
Lines 41-64 Link Here
41
%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnokii.mo
41
%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnokii.mo
42
%%SMSD%%share/smsd/README
42
%%SMSD%%share/smsd/README
43
%%SMSD%%share/smsd/action
43
%%SMSD%%share/smsd/action
44
%%SMSD%%lib/smsd/libfile.a
44
%%SMSD%%lib/smsd/libsmsd_file.a
45
%%SMSD%%lib/smsd/libfile.la
45
%%SMSD%%lib/smsd/libsmsd_file.la
46
%%SMSD%%lib/smsd/libfile.so
46
%%SMSD%%lib/smsd/libsmsd_file.so
47
%%MSM%%lib/smsd/libmysql.a
47
%%MSM%%lib/smsd/libsmsd_mysql.a
48
%%MSM%%lib/smsd/libmysql.la
48
%%MSM%%lib/smsd/libsmsd_mysql.la
49
%%MSM%%lib/smsd/libmysql.so
49
%%MSM%%lib/smsd/libsmsd_mysql.so
50
%%MSM%%share/smsd/sms.tables.mysql.sql
50
%%MSM%%share/smsd/sms.tables.mysql.sql
51
%%PGM%%lib/smsd/libpq.a
51
%%PGM%%lib/smsd/libsmsd_pq.a
52
%%PGM%%lib/smsd/libpq.la
52
%%PGM%%lib/smsd/libsmsd_pq.la
53
%%PGM%%lib/smsd/libpq.so
53
%%PGM%%lib/smsd/libsmsd_pq.so
54
%%PGM%%share/smsd/sms.tables.pq.sql
54
%%PGM%%share/smsd/sms.tables.pq.sql
55
%%SMSD%%@dirrm lib/smsd
55
%%SMSD%%@dirrm lib/smsd
56
%%SMSD%%@dirrm share/smsd
56
%%SMSD%%@dirrm share/smsd
57
%%X11%%share/applications/xgnokii.desktop
57
%%X11%%share/applications/xgnokii.desktop
58
%%X11%%share/xgnokii/help/C
59
%%X11%%share/xgnokii/help/POSIX
60
%%X11%%share/xgnokii/help/en_US/COPYING
61
%%X11%%share/xgnokii/help/en_US/CREDITS
62
%%X11%%share/xgnokii/help/en_US/faq.html
58
%%X11%%share/xgnokii/help/en_US/faq.html
63
%%X11%%share/xgnokii/help/en_US/firmware/firmware.html
59
%%X11%%share/xgnokii/help/en_US/firmware/firmware.html
64
%%X11%%share/xgnokii/help/en_US/index.html
60
%%X11%%share/xgnokii/help/en_US/index.html
Lines 77-83 Link Here
77
%%X11%%share/xgnokii/help/en_US/netmon/nm_5110.png
73
%%X11%%share/xgnokii/help/en_US/netmon/nm_5110.png
78
%%X11%%share/xgnokii/help/en_US/netmon/nm_9110.png
74
%%X11%%share/xgnokii/help/en_US/netmon/nm_9110.png
79
%%X11%%share/xgnokii/help/en_US/netmon/tip.png
75
%%X11%%share/xgnokii/help/en_US/netmon/tip.png
80
%%X11%%share/xgnokii/help/en_US/sample/gnokiirc
81
%%X11%%share/xgnokii/help/en_US/styl.css
76
%%X11%%share/xgnokii/help/en_US/styl.css
82
%%X11%%share/xgnokii/help/pl_PL/calendar.html
77
%%X11%%share/xgnokii/help/pl_PL/calendar.html
83
%%X11%%share/xgnokii/help/pl_PL/contacts.html
78
%%X11%%share/xgnokii/help/pl_PL/contacts.html
Lines 120-167 Link Here
120
%%X11%%share/xgnokii/help/pl_PL/sms.html
115
%%X11%%share/xgnokii/help/pl_PL/sms.html
121
%%X11%%share/xgnokii/help/pl_PL/speeddial.html
116
%%X11%%share/xgnokii/help/pl_PL/speeddial.html
122
%%X11%%share/xgnokii/help/pl_PL/xkeyb.html
117
%%X11%%share/xgnokii/help/pl_PL/xkeyb.html
123
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/calendar
124
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/contacts
125
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/dtmf
126
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/main
127
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/netmon/gsm
128
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/sms
129
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/speeddial
130
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/xkeyb
131
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/cables
132
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/irda
133
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows
134
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/calendar
135
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/contacts
136
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/dtmf
137
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/main
138
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/netmon
139
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/sms
140
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/speeddial
141
%%X11%%@exec mkdir -p %D/share/xgnokii/help/en_US/windows/xkeyb
142
%%X11%%@exec mkdir -p %D/share/doc/gnokii/sample/vCard
143
%%X11%%@dirrm share/xgnokii/help/en_US/cables
144
%%X11%%@dirrm share/xgnokii/help/en_US/calendar
145
%%X11%%@dirrm share/xgnokii/help/en_US/contacts
146
%%X11%%@dirrm share/xgnokii/help/en_US/dtmf
147
%%X11%%@dirrm share/xgnokii/help/en_US/firmware
118
%%X11%%@dirrm share/xgnokii/help/en_US/firmware
148
%%X11%%@dirrm share/xgnokii/help/en_US/irda
149
%%X11%%@dirrm share/xgnokii/help/en_US/main
150
%%X11%%@dirrm share/xgnokii/help/en_US/netmon/gsm
151
%%X11%%@dirrm share/xgnokii/help/en_US/netmon
119
%%X11%%@dirrm share/xgnokii/help/en_US/netmon
152
%%X11%%@dirrm share/xgnokii/help/en_US/sms
153
%%X11%%@dirrm share/xgnokii/help/en_US/speeddial
154
%%X11%%@dirrm share/xgnokii/help/en_US/windows/calendar
155
%%X11%%@dirrm share/xgnokii/help/en_US/windows/contacts
156
%%X11%%@dirrm share/xgnokii/help/en_US/windows/dtmf
157
%%X11%%@dirrm share/xgnokii/help/en_US/windows/main
158
%%X11%%@dirrm share/xgnokii/help/en_US/windows/netmon
159
%%X11%%@dirrm share/xgnokii/help/en_US/windows/sms
160
%%X11%%@dirrm share/xgnokii/help/en_US/windows/speeddial
161
%%X11%%@dirrm share/xgnokii/help/en_US/windows/xkeyb
162
%%X11%%@dirrm share/xgnokii/help/en_US/windows
163
%%X11%%@dirrm share/xgnokii/help/en_US/xkeyb
164
%%X11%%@dirrm share/xgnokii/help/en_US/sample
165
%%X11%%@dirrm share/xgnokii/help/en_US
120
%%X11%%@dirrm share/xgnokii/help/en_US
166
%%X11%%@dirrm share/xgnokii/help/pl_PL/netmon/gsm
121
%%X11%%@dirrm share/xgnokii/help/pl_PL/netmon/gsm
167
%%X11%%@dirrm share/xgnokii/help/pl_PL/netmon
122
%%X11%%@dirrm share/xgnokii/help/pl_PL/netmon

Return to bug 124305