cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to glib 1.2.6

Browse Source
This commit is contained in:
brad 1999-10-27 01:14:24 +00:00
parent 37c8b228fd
commit 65791dacd2
7 changed files with 61 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/glib/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.16 1999/09/04 04:56:24 brad Exp $ # $OpenBSD: Makefile,v 1.17 1999/10/27 01:14:24 brad Exp $
DISTNAME= glib-1.2.4 DISTNAME= glib-1.2.6
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@ -10,7 +10,6 @@ NEED_VERSION= 1.73
MAINTAINER= brad@openbsd.org MAINTAINER= brad@openbsd.org
SEPARATE_BUILD= simple
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --disable-threads \ CONFIGURE_ARGS+= --enable-static --disable-threads \
@ -38,14 +37,15 @@ pre-extract:
fi fi
post-extract: post-extract:
@${RM} ${WRKSRC}/docs/*.info @${RM} -f ${WRKSRC}/docs/glib.info*
post-install: post-install:
@${MKDIR} ${LOCALBASE}/share/aclocal @${MKDIR} ${LOCALBASE}/share/aclocal
@${INSTALL_DATA} ${WRKSRC}/glib.m4 ${LOCALBASE}/share/aclocal/ @${INSTALL_DATA} ${WRKSRC}/glib.m4 ${LOCALBASE}/share/aclocal/
@test -f ${PREFIX}/info/dir || \ @if [ ! -f ${PREFIX}/info/dir ]; then \
sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
fi
@install-info ${PREFIX}/info/glib.info ${PREFIX}/info/dir @install-info ${PREFIX}/info/glib.info ${PREFIX}/info/dir
${LDCONFIG} -m ${PREFIX}/lib @${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk> .include <bsd.port.mk>

6
devel/glib/files/md5
View File

@ -1,3 +1,3 @@
MD5 (glib-1.2.4.tar.gz) = ff1061e3dc620ff0bff61adae7524ccc MD5 (glib-1.2.6.tar.gz) = 0a3af2085d6a597e43a3bfff9034ca68
RMD160 (glib-1.2.4.tar.gz) = ba0b2071d0a65d0e193755f6ac6195fe560bb7e1 RMD160 (glib-1.2.6.tar.gz) = 2240ab13aaa046dfeb79cea127efe7c8fd6abc2a
SHA1 (glib-1.2.4.tar.gz) = 1b6c46e760b2186cf6811e65807abeb529fd4a8d SHA1 (glib-1.2.6.tar.gz) = 7899dedaa61c1f695cc8ca8e46d360548d915cd8

91
devel/glib/patches/patch-aa
View File

@ -1,88 +1,29 @@
--- Makefile.in.orig Mon Aug 23 16:02:15 1999 --- Makefile.in.orig Thu Oct 7 13:35:19 1999
+++ Makefile.in Sat Aug 28 00:47:32 1999 +++ Makefile.in Sat Oct 16 16:39:16 1999
@@ -99,8 +99,6 @@ @@ -99,7 +99,7 @@
SUBDIRS = . gmodule gthread docs tests SUBDIRS = . gmodule gthread docs tests
-configincludedir = $(pkglibdir)/include -configincludedir = $(pkglibdir)/include
- +configincludedir = $(includedir)
bin_SCRIPTS = glib-config bin_SCRIPTS = glib-config
BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h @@ -123,7 +123,7 @@
@@ -115,13 +113,9 @@
libglib_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c
CONFIGURE_DEPENDENCIES = acglib.m4
-include_HEADERS = glib.h -libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic
- +libglib_la_LDFLAGS = -version-info 1:2:0 -export-dynamic
-
-configinclude_DATA = glibconfig.h
-
+include_HEADERS = glib.h glibconfig.h
-libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
+libglib_la_LDFLAGS = -version-info 1:2:0
noinst_PROGRAMS = testglib testgdate testgdateparser noinst_PROGRAMS = testglib testgdate testgdateparser
@@ -169,7 +163,7 @@ @@ -572,7 +572,7 @@
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) uninstall-configincludeDATA uninstall-m4dataDATA \
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA = $(configinclude_DATA) $(m4data_DATA)
+DATA = $(m4data_DATA)
HEADERS = $(include_HEADERS)
@@ -343,25 +337,6 @@
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
done
-install-configincludeDATA: $(configinclude_DATA)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(configincludedir)
- @list='$(configinclude_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p"; \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p; \
- fi; fi; \
- done
-
-uninstall-configincludeDATA:
- @$(NORMAL_UNINSTALL)
- list='$(configinclude_DATA)'; for p in $$list; do \
- rm -f $(DESTDIR)$(configincludedir)/$$p; \
- done
-
install-m4dataDATA: $(m4data_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(m4datadir)
@@ -559,15 +534,14 @@
install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
install-exec: install-exec-recursive
-install-data-am: install-configincludeDATA install-m4dataDATA \
- install-includeHEADERS
+install-data-am: install-m4dataDATA install-includeHEADERS
install-data: install-data-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-recursive
uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS \
- uninstall-configincludeDATA uninstall-m4dataDATA \
+ uninstall-m4dataDATA \
uninstall-includeHEADERS uninstall-includeHEADERS
uninstall: uninstall-recursive uninstall: uninstall-recursive
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \ -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
@@ -633,7 +607,6 @@ +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
maintainer-clean-libtool mostlyclean-noinstPROGRAMS \ $(HEADERS) config.h
distclean-noinstPROGRAMS clean-noinstPROGRAMS \ all-redirect: all-recursive-am
maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \ install-strip:
-uninstall-configincludeDATA install-configincludeDATA \
uninstall-m4dataDATA install-m4dataDATA uninstall-includeHEADERS \
install-includeHEADERS install-data-recursive uninstall-data-recursive \
install-exec-recursive uninstall-exec-recursive installdirs-recursive \

17
devel/glib/patches/patch-ab
View File

@ -1,11 +1,20 @@
--- gmodule/Makefile.in.orig Tue May 11 12:48:40 1999 --- gmodule/Makefile.in.orig Thu Oct 7 13:35:21 1999
+++ gmodule/Makefile.in Tue May 11 12:49:24 1999 +++ gmodule/Makefile.in Sat Oct 16 16:40:23 1999
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
libgmodule_la_SOURCES = gmodule.c libgmodule_la_SOURCES = gmodule.c
-libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic
+libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 1:2:0 +libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 1:2:0 -export-dynamic
libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
@@ -333,7 +333,7 @@
install: install-am
uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install

17
devel/glib/patches/patch-ac
View File

@ -1,11 +1,20 @@
--- gthread/Makefile.in.orig Tue May 11 14:15:36 1999 --- gthread/Makefile.in.orig Thu Oct 7 13:35:23 1999
+++ gthread/Makefile.in Tue May 11 14:15:54 1999 +++ gthread/Makefile.in Sat Oct 16 17:14:30 1999
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
lib_LTLIBRARIES = libgthread.la lib_LTLIBRARIES = libgthread.la
libgthread_la_SOURCES = gthread.c libgthread_la_SOURCES = gthread.c
-libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic
+libgthread_la_LDFLAGS = -version-info 1:2:0 +libgthread_la_LDFLAGS = -version-info 1:2:0 -export-dynamic
libgthread_la_LIBADD = @G_THREAD_LIBS@ libgthread_la_LIBADD = @G_THREAD_LIBS@
@@ -297,7 +297,7 @@
install: install-am
uninstall-am: uninstall-libLTLIBRARIES
uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+all-am: Makefile $(LTLIBRARIES)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install

7
devel/glib/pkg/PLIST
View File

@ -1,9 +1,10 @@
@unexec install-info --delete --info-dir=%D/info %D/info/glib.info
bin/glib-config bin/glib-config
include/glib/glib.h include/glib/glib.h
include/glib/glibconfig.h include/glib/glibconfig.h
include/glib/gmodule.h include/glib/gmodule.h
@unexec install-info --delete %D/info/glib.info %D/info/dir
info/glib.info info/glib.info
@exec install-info %D/info/glib.info %D/info/dir
lib/libglib.a lib/libglib.a
lib/libglib.la lib/libglib.la
lib/libglib.so.1.2 lib/libglib.so.1.2
@ -13,9 +14,7 @@ lib/libgmodule.so.1.2
lib/libgthread.a lib/libgthread.a
lib/libgthread.la lib/libgthread.la
lib/libgthread.so.1.2 lib/libgthread.so.1.2
@exec /sbin/ldconfig -m %B
man/man1/glib-config.1 man/man1/glib-config.1
share/aclocal/glib.m4 share/aclocal/glib.m4
@dirrm include/glib @dirrm include/glib
@exec [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -m %D/lib
@unexec [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -m %D/lib
@exec install-info --info-dir=%D/info %D/info/glib.info

13
devel/glib/pkg/PLIST.noshared
View File

@ -1,17 +1,16 @@
bin/glib-config bin/glib-config
include/glib/glib.h
include/glib/glibconfig.h
include/glib/gmodule.h
@unexec install-info --delete %D/info/glib.info %D/info/dir @unexec install-info --delete %D/info/glib.info %D/info/dir
info/glib.info info/glib.info
@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@exec install-info %D/info/glib.info %D/info/dir @exec install-info %D/info/glib.info %D/info/dir
lib/libglib.la
lib/libglib.a lib/libglib.a
lib/libgmodule.la lib/libglib.la
lib/libgmodule.a lib/libgmodule.a
lib/libgthread.la lib/libgmodule.la
lib/libgthread.a lib/libgthread.a
lib/libgthread.la
man/man1/glib-config.1 man/man1/glib-config.1
share/aclocal/glib.m4 share/aclocal/glib.m4
include/glib/glib.h
include/glib/gmodule.h
include/glib/glibconfig.h
@dirrm include/glib @dirrm include/glib